Skip to content

A self-hosted media server and file management system

error handling

aminnausin6cfcf9bb10d9
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index 5eafe467..ff3ad0d5 100644
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -21,13 +21,21 @@ class DirectoryController extends Controller
return view('error', $data);
}
- $data['dir'] = array('id'=>Category::select('id')->firstWhere('name', 'ilike', '%' . $request->dir . '%')->id, 'name'=>$request->dir);
- if(isset($request->folder_name)){
- $data['folder'] = array('id'=>null, 'name'=>$request->folder_name);
+ $dirRaw = Category::select('id')->firstWhere('name', 'ilike', '%' . $request->dir . '%');
+
+ if(isset($dirRaw->id)){
+ $data['dir'] = array('id'=>$dirRaw->id,'name'=>$request->dir);
+ if(isset($request->folder_name)){
+ $data['folder'] = array('id'=>null, 'name'=>$request->folder_name);
+ }
+ else{
+ $folderRaw = Folder::select('id','name')->firstWhere('category_id', $data['dir']['id']);
+ $data['folder'] = array('id'=>$folderRaw->id, 'name'=>$folderRaw->name);
+ }
}
else{
- $folderRaw = Folder::select('id','name')->firstWhere('category_id', $data['dir']['id']);
- $data['folder'] = array('id'=>$folderRaw->id, 'name'=>$folderRaw->name);
+ $data['dir'] = array('id'=>$dirRaw->id,'name'=>$request->dir);
+ $data['folder'] = array('id'=>null, 'name'=>null);
}
// dump($data);
diff --git a/public/js/main.js b/public/js/main.js
index 5c30d921..925f4b94 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -228,6 +228,12 @@ function parseHistory(data, count = 10, empty = true) {
async function loadCategoryFolders(){
const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
+
+ if(stateDirectory.id === -1){
+ toastr["error"](`An invalid category "${stateDirectory.name}" was provided in the URL.`, "Invalid Category");
+ return;
+ }
+
fetch(`/api/folders`, {
method: 'post',
headers: {
@@ -342,11 +348,15 @@ async function loadVideosAndParse(data){
// parse the user provided folder name into an actual folder in the directory and get id if id not present
if(isNaN(parseInt(stateFolder.id))){
if(stateFolder.name === null | stateFolder.name === undefined) {
- toastr["error"](`An invalid folder name [${stateFolder.name}] was provided in the URL.`, "Invalid Folder");
+ toastr["error"](`An invalid folder name "${stateFolder.name}" was provided in the URL.`, "Invalid Folder");
return;
}
let res = data.find(folder => folder.attributes["name"].toLowerCase().localeCompare(stateFolder.name.toLowerCase()) == 0);
+ if(!res){
+ toastr["error"](`An invalid folder name "${stateFolder.name}" was provided in the URL.`, "Invalid Folder");
+ return;
+ }
stateFolder = {id: res["id"], name: res.attributes["name"]};
}