From 6926d5b065868dba2dcf015359decce222acf045 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 3 Apr 2025 22:06:49 -0400 Subject: [PATCH] userPermissions issue fixed --- copyFiles.php | 3 +-- createFolder.php | 4 ++-- deleteFolder.php | 4 ++-- extractZip.php | 4 ++-- moveFiles.php | 3 +-- renameFile.php | 4 ++-- renameFolder.php | 3 +-- saveFile.php | 3 +-- upload.php | 3 ++- 9 files changed, 14 insertions(+), 17 deletions(-) diff --git a/copyFiles.php b/copyFiles.php index 8264803..e9e368c 100644 --- a/copyFiles.php +++ b/copyFiles.php @@ -18,9 +18,8 @@ if (!isset($_SESSION['authenticated']) || $_SESSION['authenticated'] !== true) { exit; } -$userPermissions = loadUserPermissions($username); -// Check if the user is read-only. (Assuming that if readOnly is true, deletion is disallowed.) $username = $_SESSION['username'] ?? ''; +$userPermissions = loadUserPermissions($username); if ($username) { $userPermissions = loadUserPermissions($username); if (isset($userPermissions['readOnly']) && $userPermissions['readOnly'] === true) { diff --git a/createFolder.php b/createFolder.php index 449a21e..ed21c1b 100644 --- a/createFolder.php +++ b/createFolder.php @@ -23,9 +23,9 @@ if ($receivedToken !== $_SESSION['csrf_token']) { http_response_code(403); exit; } -$userPermissions = loadUserPermissions($username); -// Check if the user is read-only. (Assuming that if readOnly is true, deletion is disallowed.) + $username = $_SESSION['username'] ?? ''; +$userPermissions = loadUserPermissions($username); if ($username) { $userPermissions = loadUserPermissions($username); if (isset($userPermissions['readOnly']) && $userPermissions['readOnly'] === true) { diff --git a/deleteFolder.php b/deleteFolder.php index 818c4a7..a8e47de 100644 --- a/deleteFolder.php +++ b/deleteFolder.php @@ -23,9 +23,9 @@ if ($receivedToken !== $_SESSION['csrf_token']) { http_response_code(403); exit; } -$userPermissions = loadUserPermissions($username); -// Check if the user is read-only. (Assuming that if readOnly is true, deletion is disallowed.) + $username = $_SESSION['username'] ?? ''; +$userPermissions = loadUserPermissions($username); if ($username) { $userPermissions = loadUserPermissions($username); if (isset($userPermissions['readOnly']) && $userPermissions['readOnly'] === true) { diff --git a/extractZip.php b/extractZip.php index f279169..2d71271 100644 --- a/extractZip.php +++ b/extractZip.php @@ -17,9 +17,9 @@ if (!isset($_SESSION['authenticated']) || $_SESSION['authenticated'] !== true) { echo json_encode(["error" => "Unauthorized"]); exit; } -$userPermissions = loadUserPermissions($username); -// Check if the user is read-only. (Assuming that if readOnly is true, deletion is disallowed.) + $username = $_SESSION['username'] ?? ''; +$userPermissions = loadUserPermissions($username); if ($username) { $userPermissions = loadUserPermissions($username); if (isset($userPermissions['readOnly']) && $userPermissions['readOnly'] === true) { diff --git a/moveFiles.php b/moveFiles.php index 54bf61e..061382a 100644 --- a/moveFiles.php +++ b/moveFiles.php @@ -20,9 +20,8 @@ if (!isset($_SESSION['authenticated']) || $_SESSION['authenticated'] !== true) { http_response_code(401); exit; } -$userPermissions = loadUserPermissions($username); -// Check if the user is read-only. (Assuming that if readOnly is true, deletion is disallowed.) $username = $_SESSION['username'] ?? ''; +$userPermissions = loadUserPermissions($username); if ($username) { $userPermissions = loadUserPermissions($username); if (isset($userPermissions['readOnly']) && $userPermissions['readOnly'] === true) { diff --git a/renameFile.php b/renameFile.php index f9235aa..388c620 100644 --- a/renameFile.php +++ b/renameFile.php @@ -21,9 +21,9 @@ if (!isset($_SESSION['authenticated']) || $_SESSION['authenticated'] !== true) { http_response_code(401); exit; } -$userPermissions = loadUserPermissions($username); -// Check if the user is read-only. (Assuming that if readOnly is true, deletion is disallowed.) + $username = $_SESSION['username'] ?? ''; +$userPermissions = loadUserPermissions($username); if ($username) { $userPermissions = loadUserPermissions($username); if (isset($userPermissions['readOnly']) && $userPermissions['readOnly'] === true) { diff --git a/renameFolder.php b/renameFolder.php index edb417d..5141688 100644 --- a/renameFolder.php +++ b/renameFolder.php @@ -27,9 +27,8 @@ if ($receivedToken !== $_SESSION['csrf_token']) { http_response_code(403); exit; } -$userPermissions = loadUserPermissions($username); -// Check if the user is read-only. (Assuming that if readOnly is true, deletion is disallowed.) $username = $_SESSION['username'] ?? ''; +$userPermissions = loadUserPermissions($username); if ($username) { $userPermissions = loadUserPermissions($username); if (isset($userPermissions['readOnly']) && $userPermissions['readOnly'] === true) { diff --git a/saveFile.php b/saveFile.php index 7a0750e..1abfb0a 100644 --- a/saveFile.php +++ b/saveFile.php @@ -18,9 +18,8 @@ if (!isset($_SESSION['authenticated']) || $_SESSION['authenticated'] !== true) { http_response_code(401); exit; } -$userPermissions = loadUserPermissions($username); -// Check if the user is read-only. (Assuming that if readOnly is true, deletion is disallowed.) $username = $_SESSION['username'] ?? ''; +$userPermissions = loadUserPermissions($username); if ($username) { $userPermissions = loadUserPermissions($username); if (isset($userPermissions['readOnly']) && $userPermissions['readOnly'] === true) { diff --git a/upload.php b/upload.php index eb6189a..3ecf003 100644 --- a/upload.php +++ b/upload.php @@ -18,8 +18,9 @@ if (!isset($_SESSION['authenticated']) || $_SESSION['authenticated'] !== true) { http_response_code(401); exit; } -$userPermissions = loadUserPermissions($username); + $username = $_SESSION['username'] ?? ''; +$userPermissions = loadUserPermissions($username); if ($username) { $userPermissions = loadUserPermissions($username); if (isset($userPermissions['disableUpload']) && $userPermissions['disableUpload'] === true) {