@@ -43,16 +43,16 @@ discard block |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /* do checks */ |
| 46 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 46 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 47 | 47 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], curPage($SETTINGS), $SETTINGS) === false) { |
| 48 | 48 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 49 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 49 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 50 | 50 | exit; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | // Load template |
| 54 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 55 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 54 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 55 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 56 | 56 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 57 | 57 | // Prepare GET variables |
| 58 | 58 | $get = []; |
@@ -73,25 +73,25 @@ discard block |
||
| 73 | 73 | // prepare list of timezones |
| 74 | 74 | $zones = timezone_list(); |
| 75 | 75 | // prepare list of languages |
| 76 | -$languages = DB::query('SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC'); |
|
| 76 | +$languages = DB::query('SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC'); |
|
| 77 | 77 | // Do some stats |
| 78 | -DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_creation" AND id_user = "' . $_SESSION['user_id'] . '"'); |
|
| 78 | +DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_creation" AND id_user = "'.$_SESSION['user_id'].'"'); |
|
| 79 | 79 | $userItemsNumber = DB::count(); |
| 80 | -DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_modification" AND id_user = "' . $_SESSION['user_id'] . '"'); |
|
| 80 | +DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_modification" AND id_user = "'.$_SESSION['user_id'].'"'); |
|
| 81 | 81 | $userModificationNumber = DB::count(); |
| 82 | -DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_shown" AND id_user = "' . $_SESSION['user_id'] . '"'); |
|
| 82 | +DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_shown" AND id_user = "'.$_SESSION['user_id'].'"'); |
|
| 83 | 83 | $userSeenItemsNumber = DB::count(); |
| 84 | -DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_password_shown" AND id_user = "' . $_SESSION['user_id'] . '"'); |
|
| 84 | +DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_password_shown" AND id_user = "'.$_SESSION['user_id'].'"'); |
|
| 85 | 85 | $userSeenPasswordsNumber = DB::count(); |
| 86 | 86 | $userInfo = DB::queryFirstRow( |
| 87 | 87 | 'SELECT avatar |
| 88 | - FROM ' . prefixTable('users') . ' |
|
| 89 | - WHERE id = "' . $_SESSION['user_id'] . '"' |
|
| 88 | + FROM ' . prefixTable('users').' |
|
| 89 | + WHERE id = "' . $_SESSION['user_id'].'"' |
|
| 90 | 90 | ); |
| 91 | 91 | if (empty($userInfo['avatar']) === true) { |
| 92 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 92 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 93 | 93 | } else { |
| 94 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar']; |
|
| 94 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar']; |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | // Get Groups name |
@@ -99,8 +99,8 @@ discard block |
||
| 99 | 99 | foreach ($_SESSION['user_roles'] as $role) { |
| 100 | 100 | $tmp = DB::queryFirstRow( |
| 101 | 101 | 'SELECT title |
| 102 | - FROM ' . prefixTable('roles_title') . ' |
|
| 103 | - WHERE id = "' . $role . '"' |
|
| 102 | + FROM ' . prefixTable('roles_title').' |
|
| 103 | + WHERE id = "' . $role.'"' |
|
| 104 | 104 | ); |
| 105 | 105 | if ($tmp !== null) { |
| 106 | 106 | array_push($userParOfGroups, $tmp['title']); |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | <h3 id="profile-username" class="text-center"> |
| 145 | 145 | <?php |
| 146 | 146 | if (isset($_SESSION['name']) === true && empty($_SESSION['name']) === false) { |
| 147 | - echo $_SESSION['name'] . ' ' . $_SESSION['lastname']; |
|
| 147 | + echo $_SESSION['name'].' '.$_SESSION['lastname']; |
|
| 148 | 148 | } else { |
| 149 | 149 | echo $_SESSION['login']; |
| 150 | 150 | } |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | } else { |
| 212 | 212 | echo date('d/m/Y', (int) $_SESSION['last_connection']); |
| 213 | 213 | } |
| 214 | - echo ' ' . langHdl('at') . ' '; |
|
| 214 | + echo ' '.langHdl('at').' '; |
|
| 215 | 215 | if (isset($SETTINGS['time_format']) === true) { |
| 216 | 216 | echo date($SETTINGS['time_format'], (int) $_SESSION['last_connection']); |
| 217 | 217 | } else { |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | </a> |
| 222 | 222 | </li> |
| 223 | 223 | <?php |
| 224 | - if (isset($_SESSION['last_pw_change']) && ! empty($_SESSION['last_pw_change'])) { |
|
| 224 | + if (isset($_SESSION['last_pw_change']) && !empty($_SESSION['last_pw_change'])) { |
|
| 225 | 225 | // Handle last password change string |
| 226 | 226 | if (isset($_SESSION['last_pw_change']) === true) { |
| 227 | 227 | if (isset($SETTINGS['date_format']) === true) { |
@@ -241,12 +241,12 @@ discard block |
||
| 241 | 241 | ) { |
| 242 | 242 | $numDaysBeforePwExpiration = ''; |
| 243 | 243 | } else { |
| 244 | - $numDaysBeforePwExpiration = $LANG['index_pw_expiration'] . ' ' . $_SESSION['numDaysBeforePwExpiration'] . ' ' . $LANG['days'] . '.'; |
|
| 244 | + $numDaysBeforePwExpiration = $LANG['index_pw_expiration'].' '.$_SESSION['numDaysBeforePwExpiration'].' '.$LANG['days'].'.'; |
|
| 245 | 245 | } |
| 246 | 246 | echo ' |
| 247 | 247 | <li class="list-group-item"> |
| 248 | - <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . langHdl('index_last_pw_change') . '</b> |
|
| 249 | - <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a> |
|
| 248 | + <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . langHdl('index_last_pw_change').'</b> |
|
| 249 | + <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a> |
|
| 250 | 250 | </li>'; |
| 251 | 251 | } |
| 252 | 252 | ?> |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) { |
| 267 | 267 | echo ' |
| 268 | 268 | <li class="list-group-item"> |
| 269 | - <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_api_key') . '</b> |
|
| 269 | + <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_api_key').'</b> |
|
| 270 | 270 | <a class="float-right" id="profile-user-api-token">', |
| 271 | 271 | isset($_SESSION['user']['api-key']) === true ? $_SESSION['user']['api-key'] : '', |
| 272 | 272 | '</a> |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | ) { |
| 279 | 279 | echo ' |
| 280 | 280 | <li class="list-group-item"> |
| 281 | - <b><i class="fas fa-id-card-o fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_agses_card_id') . '</b> |
|
| 281 | + <b><i class="fas fa-id-card-o fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_agses_card_id').'</b> |
|
| 282 | 282 | <a class="float-right">', |
| 283 | 283 | $_SESSION['user_agsescardid'] ?? '', |
| 284 | 284 | '</a> |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | <ul class=""> |
| 303 | 303 | <?php |
| 304 | 304 | foreach ($_SESSION['user']['unsuccessfull_login_attempts_list'] as $entry) { |
| 305 | - echo '<li class="">' . $entry . '</li>'; |
|
| 305 | + echo '<li class="">'.$entry.'</li>'; |
|
| 306 | 306 | } ?> |
| 307 | 307 | </ul> |
| 308 | 308 | </div> |
@@ -315,12 +315,12 @@ discard block |
||
| 315 | 315 | <?php |
| 316 | 316 | $rows = DB::query( |
| 317 | 317 | 'SELECT label AS labelAction, date, null |
| 318 | - FROM ' . prefixTable('log_system') . ' |
|
| 318 | + FROM ' . prefixTable('log_system').' |
|
| 319 | 319 | WHERE qui = %i |
| 320 | 320 | UNION |
| 321 | 321 | SELECT l.action, l.date, i.label AS itemLabel |
| 322 | - FROM ' . prefixTable('log_items') . ' AS l |
|
| 323 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id) |
|
| 322 | + FROM ' . prefixTable('log_items').' AS l |
|
| 323 | + INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id) |
|
| 324 | 324 | WHERE l.id_user = %i AND l.action IN ("at_access") |
| 325 | 325 | ORDER BY date DESC |
| 326 | 326 | LIMIT 0, 40', |
@@ -334,9 +334,9 @@ discard block |
||
| 334 | 334 | $text = langHdl($record['labelAction']); |
| 335 | 335 | } |
| 336 | 336 | if (empty($record['NULL']) === false) { |
| 337 | - $text .= ' ' . langHdl('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>'; |
|
| 337 | + $text .= ' '.langHdl('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>'; |
|
| 338 | 338 | } |
| 339 | - echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>'; |
|
| 339 | + echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>'; |
|
| 340 | 340 | } |
| 341 | 341 | ?> |
| 342 | 342 | </ul> |
@@ -374,11 +374,10 @@ discard block |
||
| 374 | 374 | <?php |
| 375 | 375 | foreach ($zones as $key => $zone) { |
| 376 | 376 | echo ' |
| 377 | - <option value="' . $key . '"', |
|
| 377 | + <option value="' . $key.'"', |
|
| 378 | 378 | isset($_SESSION['user_timezone']) === true && $_SESSION['user_timezone'] === $key ? |
| 379 | - ' selected' : |
|
| 380 | - (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''), |
|
| 381 | - '>' . $zone . '</option>'; |
|
| 379 | + ' selected' : (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''), |
|
| 380 | + '>'.$zone.'</option>'; |
|
| 382 | 381 | } |
| 383 | 382 | ?> |
| 384 | 383 | </select> |
@@ -390,11 +389,10 @@ discard block |
||
| 390 | 389 | <select class="form-control" id="profile-user-language"> |
| 391 | 390 | <?php |
| 392 | 391 | foreach ($languages as $language) { |
| 393 | - echo '<option value="' . $language['name'] . '"', |
|
| 392 | + echo '<option value="'.$language['name'].'"', |
|
| 394 | 393 | $_SESSION['user_language'] === strtolower($language['name']) ? |
| 395 | - ' selected="selected"' : |
|
| 396 | - ($SETTINGS['default_language'] === strtolower($language['name']) ? ' selected="selected"' : ''), |
|
| 397 | - '>' . $language['label'] . '</option>'; |
|
| 394 | + ' selected="selected"' : ($SETTINGS['default_language'] === strtolower($language['name']) ? ' selected="selected"' : ''), |
|
| 395 | + '>'.$language['label'].'</option>'; |
|
| 398 | 396 | } |
| 399 | 397 | ?> |
| 400 | 398 | </select> |
@@ -407,11 +405,11 @@ discard block |
||
| 407 | 405 | <select class="form-control" id="profile-user-treeloadstrategy"> |
| 408 | 406 | |
| 409 | 407 | <option value="<?php echo langHdl('sequential'); ?>" |
| 410 | - <?php echo isset($_SESSION['user_treeloadstrategy']) === true && $_SESSION['user_treeloadstrategy'] === 'sequential' ? ' selected' : '';?> |
|
| 408 | + <?php echo isset($_SESSION['user_treeloadstrategy']) === true && $_SESSION['user_treeloadstrategy'] === 'sequential' ? ' selected' : ''; ?> |
|
| 411 | 409 | ><?php echo langHdl('sequential'); ?></option> |
| 412 | 410 | |
| 413 | 411 | <option value="<?php echo langHdl('full'); ?>" |
| 414 | - <?php echo isset($_SESSION['user_treeloadstrategy']) === true && $_SESSION['user_treeloadstrategy'] === 'full' ? ' selected' : '';?> |
|
| 412 | + <?php echo isset($_SESSION['user_treeloadstrategy']) === true && $_SESSION['user_treeloadstrategy'] === 'full' ? ' selected' : ''; ?> |
|
| 415 | 413 | ><?php echo langHdl('full'); ?></option> |
| 416 | 414 | </select> |
| 417 | 415 | </div> |
@@ -445,7 +443,7 @@ discard block |
||
| 445 | 443 | <button type="button" class="btn btn-warning float-right ml-2" id="profile-avatar-file"><?php echo langHdl('upload_new_avatar'); ?></button> |
| 446 | 444 | <?php |
| 447 | 445 | if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) { |
| 448 | - echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . langHdl('generate_api_token') . '</button>'; |
|
| 446 | + echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.langHdl('generate_api_token').'</button>'; |
|
| 449 | 447 | } |
| 450 | 448 | ?> |
| 451 | 449 | <div id="profile-avatar-file-container" class="hidden"></div> |
@@ -36,10 +36,10 @@ discard block |
||
| 36 | 36 | include __DIR__.'/../includes/config/tp.config.php'; |
| 37 | 37 | |
| 38 | 38 | // includes |
| 39 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 40 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 41 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 42 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 39 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 40 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 41 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 42 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 43 | 43 | |
| 44 | 44 | // header |
| 45 | 45 | header('Content-type: text/html; charset=utf-8'); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | // Connect to mysql server |
| 56 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 56 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 57 | 57 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 58 | 58 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 59 | 59 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | DB::$connect_options = DB_CONNECT_OPTIONS; |
| 68 | 68 | |
| 69 | 69 | // Superglobal load |
| 70 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 70 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
| 71 | 71 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 72 | 72 | |
| 73 | 73 | // Prepare sanitization |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | ); |
| 117 | 117 | |
| 118 | 118 | $lastFolderChange = DB::queryfirstrow( |
| 119 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' |
|
| 119 | + 'SELECT valeur FROM '.prefixTable('misc').' |
|
| 120 | 120 | WHERE type = %s AND intitule = %s', |
| 121 | 121 | 'timestamp', |
| 122 | 122 | 'last_folder_change' |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | // We don't use the cache if an ID of folder is provided |
| 138 | 138 | if ($goTreeRefresh['state'] === true || empty($inputData['nodeId']) === false || $inputData['userTreeLoadStrategy'] === 'sequential') { |
| 139 | 139 | // Build tree |
| 140 | - require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tree/NestedTree/NestedTree.php'; |
|
| 140 | + require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tree/NestedTree/NestedTree.php'; |
|
| 141 | 141 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 142 | 142 | |
| 143 | 143 | if ( |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | // get count of Items in this folder |
| 287 | 287 | DB::query( |
| 288 | 288 | 'SELECT * |
| 289 | - FROM ' . prefixTable('items') . ' |
|
| 289 | + FROM ' . prefixTable('items').' |
|
| 290 | 290 | WHERE inactif=%i AND id_tree = %i', |
| 291 | 291 | 0, |
| 292 | 292 | $nodeId |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | // get info about current folder |
| 297 | 297 | DB::query( |
| 298 | 298 | 'SELECT * |
| 299 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 299 | + FROM ' . prefixTable('nested_tree').' |
|
| 300 | 300 | WHERE parent_id = %i', |
| 301 | 301 | $nodeId |
| 302 | 302 | ); |
@@ -309,8 +309,7 @@ discard block |
||
| 309 | 309 | } else { |
| 310 | 310 | // If personal Folder, convert id into user name |
| 311 | 311 | $ret['title'] = (string) $nodeTitle === (string) $userId && (int) $nodeLevel === 1 ? |
| 312 | - $userLogin : |
|
| 313 | - htmlspecialchars_decode($nodeTitle, ENT_QUOTES); |
|
| 312 | + $userLogin : htmlspecialchars_decode($nodeTitle, ENT_QUOTES); |
|
| 314 | 313 | } |
| 315 | 314 | |
| 316 | 315 | $ret['text'] = str_replace( |
@@ -384,7 +383,7 @@ discard block |
||
| 384 | 383 | ) === true |
| 385 | 384 | ) { |
| 386 | 385 | DB::query( |
| 387 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 386 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 388 | 387 | WHERE inactif=%i AND id_tree = %i', |
| 389 | 388 | 0, |
| 390 | 389 | $node |
@@ -471,7 +470,7 @@ discard block |
||
| 471 | 470 | { |
| 472 | 471 | // get info about current folder |
| 473 | 472 | DB::query( |
| 474 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 473 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 475 | 474 | WHERE inactif=%i AND id_tree = %i', |
| 476 | 475 | 0, |
| 477 | 476 | $nodeId |
@@ -507,7 +506,7 @@ discard block |
||
| 507 | 506 | ); |
| 508 | 507 | |
| 509 | 508 | // prepare json return for current node |
| 510 | - $parent = $currentNode->parent_id === '0' ? '#' : 'li_' . $currentNode->parent_id; |
|
| 509 | + $parent = $currentNode->parent_id === '0' ? '#' : 'li_'.$currentNode->parent_id; |
|
| 511 | 510 | |
| 512 | 511 | // handle displaying |
| 513 | 512 | if (isKeyExistingAndEqual('show_only_accessible_folders', 1, $SETTINGS) === true) { |
@@ -524,17 +523,17 @@ discard block |
||
| 524 | 523 | array_push( |
| 525 | 524 | $ret_json, |
| 526 | 525 | array( |
| 527 | - 'id' => 'li_' . $nodeId, |
|
| 526 | + 'id' => 'li_'.$nodeId, |
|
| 528 | 527 | 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent, |
| 529 | 528 | 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'" data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.$text.$currentNode->title.$nodeData['html'], |
| 530 | 529 | 'li_attr' => array( |
| 531 | 530 | 'class' => 'jstreeopen', |
| 532 | - 'title' => 'ID [' . $nodeId . '] ' . $nodeData['title'], |
|
| 531 | + 'title' => 'ID ['.$nodeId.'] '.$nodeData['title'], |
|
| 533 | 532 | ), |
| 534 | 533 | 'a_attr' => array( |
| 535 | - 'id' => 'fld_' . $nodeId, |
|
| 534 | + 'id' => 'fld_'.$nodeId, |
|
| 536 | 535 | 'class' => $nodeData['folderClass'], |
| 537 | - 'onclick' => 'ListerItems(' . $nodeId . ', ' . $nodeData['restricted'] . ', 0, 1)', |
|
| 536 | + 'onclick' => 'ListerItems('.$nodeId.', '.$nodeData['restricted'].', 0, 1)', |
|
| 538 | 537 | 'data-title' => $currentNode->title, |
| 539 | 538 | ), |
| 540 | 539 | 'is_pf' => in_array($nodeId, $inputData['personalFolders']) === true ? 1 : 0, |
@@ -553,12 +552,12 @@ discard block |
||
| 553 | 552 | array_push( |
| 554 | 553 | $ret_json, |
| 555 | 554 | array( |
| 556 | - 'id' => 'li_' . $nodeId, |
|
| 555 | + 'id' => 'li_'.$nodeId, |
|
| 557 | 556 | 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent, |
| 558 | 557 | '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.$currentNode->title.$nodeData['html'], |
| 559 | 558 | 'li_attr' => array( |
| 560 | 559 | 'class' => '', |
| 561 | - 'title' => 'ID [' . $nodeId . '] ' . langHdl('no_access'), |
|
| 560 | + 'title' => 'ID ['.$nodeId.'] '.langHdl('no_access'), |
|
| 562 | 561 | ), |
| 563 | 562 | ) |
| 564 | 563 | ); |
@@ -572,7 +571,7 @@ discard block |
||
| 572 | 571 | foreach ($currentNode->children as $child) { |
| 573 | 572 | recursiveTree( |
| 574 | 573 | (int) $child, |
| 575 | - $tree->getNode($child),// get node info for this child |
|
| 574 | + $tree->getNode($child), // get node info for this child |
|
| 576 | 575 | /** @scrutinizer ignore-type */ $tree, |
| 577 | 576 | $listFoldersLimitedKeys, |
| 578 | 577 | $listRestrictedFoldersForItemsKeys, |
@@ -640,8 +639,8 @@ discard block |
||
| 640 | 639 | if (in_array($nodeId, $session_groupes_visibles) === true) { |
| 641 | 640 | if (in_array($nodeId, $session_read_only_folders) === true) { |
| 642 | 641 | return [ |
| 643 | - 'html' => '<i class="far fa-eye fa-xs mr-1 ml-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb . |
|
| 644 | - ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>', |
|
| 642 | + 'html' => '<i class="far fa-eye fa-xs mr-1 ml-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb. |
|
| 643 | + ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>', |
|
| 645 | 644 | 'title' => langHdl('read_only_account'), |
| 646 | 645 | 'restricted' => 1, |
| 647 | 646 | 'folderClass' => 'folder_not_droppable', |
@@ -655,8 +654,8 @@ discard block |
||
| 655 | 654 | && in_array($nodeId, $session_personal_visible_groups) === false |
| 656 | 655 | ) { |
| 657 | 656 | return [ |
| 658 | - 'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb . |
|
| 659 | - ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>', |
|
| 657 | + 'html' => '<i class="far fa-eye fa-xs mr-1"></i><span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb. |
|
| 658 | + ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>', |
|
| 660 | 659 | 'title' => $title, |
| 661 | 660 | 'restricted' => 0, |
| 662 | 661 | 'folderClass' => 'folder', |
@@ -667,8 +666,8 @@ discard block |
||
| 667 | 666 | } |
| 668 | 667 | |
| 669 | 668 | return [ |
| 670 | - 'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $itemsNb . |
|
| 671 | - ($tree_counters === 1 ? '/'.$nbChildrenItems .'/'.(count($nodeDescendants) - 1) : '') . '</span>', |
|
| 669 | + 'html' => '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$itemsNb. |
|
| 670 | + ($tree_counters === 1 ? '/'.$nbChildrenItems.'/'.(count($nodeDescendants) - 1) : '').'</span>', |
|
| 672 | 671 | 'title' => $title, |
| 673 | 672 | 'restricted' => 0, |
| 674 | 673 | 'folderClass' => 'folder', |
@@ -679,8 +678,8 @@ discard block |
||
| 679 | 678 | |
| 680 | 679 | } elseif (in_array($nodeId, $listFoldersLimitedKeys) === true) { |
| 681 | 680 | return [ |
| 682 | - 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') . |
|
| 683 | - '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>', |
|
| 681 | + 'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''). |
|
| 682 | + '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>', |
|
| 684 | 683 | 'title' => $title, |
| 685 | 684 | 'restricted' => 1, |
| 686 | 685 | 'folderClass' => 'folder', |
@@ -691,8 +690,8 @@ discard block |
||
| 691 | 690 | |
| 692 | 691 | } elseif (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) { |
| 693 | 692 | return [ |
| 694 | - 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' . |
|
| 695 | - '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>', |
|
| 693 | + 'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''. |
|
| 694 | + '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>', |
|
| 696 | 695 | 'title' => $title, |
| 697 | 696 | 'restricted' => 1, |
| 698 | 697 | 'folderClass' => 'folder', |
@@ -801,7 +800,7 @@ discard block |
||
| 801 | 800 | // Does this user has a tree cache |
| 802 | 801 | $userCacheTree = DB::queryfirstrow( |
| 803 | 802 | 'SELECT data |
| 804 | - FROM ' . prefixTable('cache_tree') . ' |
|
| 803 | + FROM ' . prefixTable('cache_tree').' |
|
| 805 | 804 | WHERE user_id = %i', |
| 806 | 805 | $userId |
| 807 | 806 | ); |