@@ -56,7 +56,7 @@ |
||
| 56 | 56 | } elseif (substr_count($val, '$pre = ') > 0) { |
| 57 | 57 | $_SESSION['pre'] = getSettingValue($val); |
| 58 | 58 | } elseif (substr_count($val, "define('SECUREPATH',") > 0) { |
| 59 | - $_SESSION['sk_file'] = substr($val, 23, strpos($val, ');')-24)."/sk.php"; |
|
| 59 | + $_SESSION['sk_file'] = substr($val, 23, strpos($val, ');') - 24)."/sk.php"; |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | } |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | $config->setIgnoreHeaderLine("true"); |
| 138 | 138 | // extract data from CSV file |
| 139 | 139 | $interpreter = new Interpreter(); |
| 140 | - $interpreter->addObserver(function (array $row) use (&$valuesToImport) { |
|
| 140 | + $interpreter->addObserver(function(array $row) use (&$valuesToImport) { |
|
| 141 | 141 | $valuesToImport[] = array( |
| 142 | 142 | 'Label' => $row[0], |
| 143 | 143 | 'Login' => $row[1], |
@@ -966,7 +966,7 @@ discard block |
||
| 966 | 966 | break; |
| 967 | 967 | } |
| 968 | 968 | |
| 969 | -spl_autoload_register(function ($class) { |
|
| 969 | +spl_autoload_register(function($class) { |
|
| 970 | 970 | $prefix = 'League\\Csv\\'; |
| 971 | 971 | $base_dir = __DIR__.'/src/'; |
| 972 | 972 | $len = strlen($prefix); |
@@ -309,7 +309,7 @@ |
||
| 309 | 309 | BeforeUpload: function (up, file) { |
| 310 | 310 | $("#import_status_ajax_loader").show(); |
| 311 | 311 | up.settings.multipart_params = { |
| 312 | - "PHPSESSID":"<?php echo $_SESSION['user_id'];?>", |
|
| 312 | + "PHPSESSID":"<?php echo $_SESSION['user_id']; ?>", |
|
| 313 | 313 | "type_upload":"import_items_from_keypass", |
| 314 | 314 | "user_token": $("#import_user_token").val() |
| 315 | 315 | }; |
@@ -309,7 +309,7 @@ |
||
| 309 | 309 | BeforeUpload: function (up, file) { |
| 310 | 310 | $("#import_status_ajax_loader").show(); |
| 311 | 311 | up.settings.multipart_params = { |
| 312 | - "PHPSESSID":"<?php echo $_SESSION['user_id'];?>", |
|
| 312 | + "PHPSESSID":"<?php echo $_SESSION['user_id']; ?>", |
|
| 313 | 313 | "type_upload":"import_items_from_keypass", |
| 314 | 314 | "user_token": $("#import_user_token").val() |
| 315 | 315 | }; |
@@ -130,16 +130,16 @@ discard block |
||
| 130 | 130 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 131 | 131 | |
| 132 | 132 | // Prepare superGlobal variables |
| 133 | - $session_forbiden_pfs = $superGlobal->get("forbiden_pfs", "SESSION"); |
|
| 134 | - $session_groupes_visibles = $superGlobal->get("groupes_visibles", "SESSION"); |
|
| 135 | - $session_list_restricted_folders_for_items = $superGlobal->get("list_restricted_folders_for_items", "SESSION"); |
|
| 136 | - $session_user_id = $superGlobal->get("user_id", "SESSION"); |
|
| 137 | - $session_login = $superGlobal->get("login", "SESSION"); |
|
| 138 | - $session_no_access_folders = $superGlobal->get("no_access_folders", "SESSION"); |
|
| 139 | - $session_list_folders_limited = $superGlobal->get("list_folders_limited", "SESSION"); |
|
| 140 | - $session_read_only_folders = $superGlobal->get("read_only_folders", "SESSION"); |
|
| 141 | - $session_personal_folders = $superGlobal->get("personal_folders", "SESSION"); |
|
| 142 | - $session_personal_visible_groups = $superGlobal->get("personal_visible_groups", "SESSION"); |
|
| 133 | + $session_forbiden_pfs = $superGlobal->get("forbiden_pfs", "SESSION"); |
|
| 134 | + $session_groupes_visibles = $superGlobal->get("groupes_visibles", "SESSION"); |
|
| 135 | + $session_list_restricted_folders_for_items = $superGlobal->get("list_restricted_folders_for_items", "SESSION"); |
|
| 136 | + $session_user_id = $superGlobal->get("user_id", "SESSION"); |
|
| 137 | + $session_login = $superGlobal->get("login", "SESSION"); |
|
| 138 | + $session_no_access_folders = $superGlobal->get("no_access_folders", "SESSION"); |
|
| 139 | + $session_list_folders_limited = $superGlobal->get("list_folders_limited", "SESSION"); |
|
| 140 | + $session_read_only_folders = $superGlobal->get("read_only_folders", "SESSION"); |
|
| 141 | + $session_personal_folders = $superGlobal->get("personal_folders", "SESSION"); |
|
| 142 | + $session_personal_visible_groups = $superGlobal->get("personal_visible_groups", "SESSION"); |
|
| 143 | 143 | |
| 144 | 144 | // Be sure that user can only see folders he/she is allowed to |
| 145 | 145 | if (in_array($nodeId, $session_forbiden_pfs) === false |
@@ -304,15 +304,15 @@ discard block |
||
| 304 | 304 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
| 305 | 305 | |
| 306 | 306 | // Prepare superGlobal variables |
| 307 | - $session_forbiden_pfs = $superGlobal->get("forbiden_pfs", "SESSION"); |
|
| 308 | - $session_groupes_visibles = $superGlobal->get("groupes_visibles", "SESSION"); |
|
| 309 | - $session_list_restricted_folders_for_items = $superGlobal->get("list_restricted_folders_for_items", "SESSION"); |
|
| 310 | - $session_user_id = $superGlobal->get("user_id", "SESSION"); |
|
| 311 | - $session_login = $superGlobal->get("login", "SESSION"); |
|
| 312 | - $session_user_read_only = $superGlobal->get("user_read_only", "SESSION"); |
|
| 313 | - $session_no_access_folders = $superGlobal->get("no_access_folders", "SESSION"); |
|
| 314 | - $session_list_folders_limited = $superGlobal->get("list_folders_limited", "SESSION"); |
|
| 315 | - $session_read_only_folders = $superGlobal->get("read_only_folders", "SESSION"); |
|
| 307 | + $session_forbiden_pfs = $superGlobal->get("forbiden_pfs", "SESSION"); |
|
| 308 | + $session_groupes_visibles = $superGlobal->get("groupes_visibles", "SESSION"); |
|
| 309 | + $session_list_restricted_folders_for_items = $superGlobal->get("list_restricted_folders_for_items", "SESSION"); |
|
| 310 | + $session_user_id = $superGlobal->get("user_id", "SESSION"); |
|
| 311 | + $session_login = $superGlobal->get("login", "SESSION"); |
|
| 312 | + $session_user_read_only = $superGlobal->get("user_read_only", "SESSION"); |
|
| 313 | + $session_no_access_folders = $superGlobal->get("no_access_folders", "SESSION"); |
|
| 314 | + $session_list_folders_limited = $superGlobal->get("list_folders_limited", "SESSION"); |
|
| 315 | + $session_read_only_folders = $superGlobal->get("read_only_folders", "SESSION"); |
|
| 316 | 316 | |
| 317 | 317 | // Be sure that user can only see folders he/she is allowed to |
| 318 | 318 | if (in_array($completTree[$nodeId]->id, $session_forbiden_pfs) === false |
@@ -341,8 +341,8 @@ |
||
| 341 | 341 | if ($getItemInList === true) { |
| 342 | 342 | $sOutputConst .= $sOutputItem; |
| 343 | 343 | } else { |
| 344 | - $iFilteredTotal --; |
|
| 345 | - $iTotal --; |
|
| 344 | + $iFilteredTotal--; |
|
| 345 | + $iTotal--; |
|
| 346 | 346 | } |
| 347 | 347 | } |
| 348 | 348 | if (!empty($sOutputConst)) { |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | $json[$inc]['nlevel'] = mb_convert_encoding($folder->nlevel, mb_detect_encoding($folder->nlevel), 'UTF-8'); |
| 634 | 634 | $json[$inc]['personal'] = mb_convert_encoding($folder->personal_folder, mb_detect_encoding($folder->personal_folder), 'UTF-8'); |
| 635 | 635 | |
| 636 | - $inc ++; |
|
| 636 | + $inc++; |
|
| 637 | 637 | } |
| 638 | 638 | } |
| 639 | 639 | } |
@@ -2099,7 +2099,7 @@ discard block |
||
| 2099 | 2099 | $tree = new Tree\NestedTree\NestedTree(prefix_table("nested_tree"), 'id', 'parent_id', 'title'); |
| 2100 | 2100 | $tree->rebuild(); |
| 2101 | 2101 | |
| 2102 | - echo json_encode(array('new_id' => $newID , 'err' => '')); |
|
| 2102 | + echo json_encode(array('new_id' => $newID, 'err' => '')); |
|
| 2103 | 2103 | } elseif ($GLOBALS['request'][1] === "edit") { |
| 2104 | 2104 | // Is this folder a personal one? |
| 2105 | 2105 | $fldData = DB::queryFirstRow( |
@@ -2166,7 +2166,7 @@ discard block |
||
| 2166 | 2166 | $item_definition['item_id'] |
| 2167 | 2167 | ); |
| 2168 | 2168 | |
| 2169 | - echo json_encode(array('new_id' => '' , 'err' => '')); |
|
| 2169 | + echo json_encode(array('new_id' => '', 'err' => '')); |
|
| 2170 | 2170 | } |
| 2171 | 2171 | } else { |
| 2172 | 2172 | rest_error('AUTH_NOT_GRANTED'); |
@@ -492,7 +492,7 @@ |
||
| 492 | 492 | $_SESSION['validite_pw'] = true; |
| 493 | 493 | } else { |
| 494 | 494 | $_SESSION['numDaysBeforePwExpiration'] = $SETTINGS['pw_life_duration'] - round( |
| 495 | - (mktime(0, 0, 0, (int)date('m'), (int)date('d'), (int)date('y')) - $_SESSION['last_pw_change']) / (24 * 60 * 60) |
|
| 495 | + (mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y')) - $_SESSION['last_pw_change']) / (24 * 60 * 60) |
|
| 496 | 496 | ); |
| 497 | 497 | if ($_SESSION['numDaysBeforePwExpiration'] <= 0) { |
| 498 | 498 | $_SESSION['validite_pw'] = false; |
@@ -50,23 +50,23 @@ |
||
| 50 | 50 | Handle CASES |
| 51 | 51 | */ |
| 52 | 52 | switch (filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING)) { |
| 53 | -case "checkSessionExists": |
|
| 54 | - // Case permit to check if SESSION is still valid |
|
| 55 | - session_start(); |
|
| 56 | - if (isset($_SESSION['CPM']) === true) { |
|
| 57 | - echo "1"; |
|
| 58 | - } else { |
|
| 59 | - // In case that no session is available |
|
| 60 | - // Force the page to be reloaded and attach the CSRFP info |
|
| 61 | - |
|
| 62 | - // Load CSRFP |
|
| 63 | - $csrfp_array = include '../includes/libraries/csrfp/libs/csrfp.config.php'; |
|
| 64 | - |
|
| 65 | - // Send back CSRFP info |
|
| 66 | - echo $csrfp_array['CSRFP_TOKEN'].";".filter_input(INPUT_POST, $csrfp_array['CSRFP_TOKEN'], FILTER_SANITIZE_STRING); |
|
| 67 | - } |
|
| 53 | + case "checkSessionExists": |
|
| 54 | + // Case permit to check if SESSION is still valid |
|
| 55 | + session_start(); |
|
| 56 | + if (isset($_SESSION['CPM']) === true) { |
|
| 57 | + echo "1"; |
|
| 58 | + } else { |
|
| 59 | + // In case that no session is available |
|
| 60 | + // Force the page to be reloaded and attach the CSRFP info |
|
| 61 | + |
|
| 62 | + // Load CSRFP |
|
| 63 | + $csrfp_array = include '../includes/libraries/csrfp/libs/csrfp.config.php'; |
|
| 64 | + |
|
| 65 | + // Send back CSRFP info |
|
| 66 | + echo $csrfp_array['CSRFP_TOKEN'].";".filter_input(INPUT_POST, $csrfp_array['CSRFP_TOKEN'], FILTER_SANITIZE_STRING); |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - break; |
|
| 69 | + break; |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |