File Manager

Author: graham-trott

dist/easycoder-min.js

@@ -5629,7 +5629,9 @@ const EasyCoder_Browser = {
 					const response = event.target.responseText;
 					setProgress(0);
 					setStatus(``);
-					console.log(response);
+					if (response) {
+						console.log(response);
+					}
 				}, false);
 				ajax.addEventListener(`error`, function () {
 					setStatus(`Upload failed`);

dist/easycoder.js

@@ -116,13 +116,16 @@ Show:
     set style `display` of Container to `block`
 
 	get UserRecord from storage as `.user`
+    put property `email` of UserRecord into Email
+    get Password from storage as `password`
     put property `home` of UserRecord into Home
+    put Home cat `/` cat property `id` of UserRecord into Home
     put `users/` cat Home cat `/images` into Home
     put Home into CurrentPath
 
 !	Build the list
 Browser:
-    rest get Content from `ulist/` cat Email can `/` cat Password cat `/` cat CurrentPath cat `?v=` cat now
+    rest get Content from `ulist/` cat Email cat `/` cat Password cat `/` cat CurrentPath cat `?v=` cat now
     or begin
         alert `Failed to list files.`
         stop
@@ -186,15 +189,13 @@ Browser:
         if FileCount is 0
         begin
             put Path into CurrentPath
-            rest post to `delete/` cat CurrentPath or
+            rest post to `udelete/` cat Email cat `/` cat Password cat `/` cat CurrentPath or
             begin
                 alert `Failed to delete a file.`
                 stop
             end
-            put the position of the last `~` in CurrentPath into N
-            if N is less than 0 put the position of the last `/` in CurrentPath into N
+            put the position of the last `/` in CurrentPath into N
             put left N of CurrentPath into CurrentPath
-            alert `Returning to ` cat CurrentPath
             go to Browser
         end
         else
@@ -210,7 +211,7 @@ SelectFile:
     put property `type` of File into Type
     if Type is `dir`
     begin
-        put CurrentPath cat `~` cat the content of FileName into CurrentPath
+        put CurrentPath cat `/` cat the content of FileName into CurrentPath
       	goto Browser
     end
     if Type is `img`
@@ -226,12 +227,11 @@ SelectFile:
         put CurrentPath cat `/` cat property `name` of File into FilePath
         set attribute `src` of Image to `/resources/` cat FilePath cat `?v=` cat now
         on click CloseButton go to CloseMedia
-        set the text of URL to `/resources/` cat FilePath
+        set the text of URL to `resources/` cat FilePath
 !    highlight URL
         on click DeleteButton
         begin
-          put `upload` cat FilePath into FilePath
-          rest post to `delete/` cat FilePath or
+          rest post to `udelete/` cat Email cat `/` cat Password cat `/` cat FilePath or
           begin
               alert `Failed to delete the image.`
               stop
@@ -258,7 +258,7 @@ Upload:
     else
     begin
         put CurrentPath into Path
-        put `upload/` cat Path into Path
+        put `upload/` cat Email cat `/` cat Password cat `/` cat Path into Path
         upload UploadFile to Path with UploadProgress and UploadStatus
         goto Browser
     end

iwsy/resources/ecs/fileman.txt

@@ -378,12 +378,8 @@ function post($conn, $props, $action, $request) {
                 $email = array_shift($request);
                 $password = array_shift($request);
                 checkUserPassword($conn, $email, $password);
-                $path = $_POST['path'];
-                $path = explode("/", $path);
-                array_shift($path);
-                $path = 'resources/' . join('/', $path);
+                $path = 'resources/' . join('/', $request);
                 mkdir($path, 0777, true);
-                logger("path: $path");
                 $fileName = $_FILES['source']['name'];
                 $tempName = $_FILES['source']['tmp_name'];
                 $fileType = $_FILES['source']['type'];
@@ -398,10 +394,11 @@ function post($conn, $props, $action, $request) {
                     $size = getimagesize("$path/$fileName");
                     logger("$path/$fileName: width:".$size[0].", height:".$size[1]);
                     if ($size[0] > 1024) {
-                        logger("mogrify -resize 1024x1024 $path/$fileName");
-                        system("mogrify -resize 1024x1024 $path/$fileName");
+                        logger("mogrify -resize 1280x1280 $path/$fileName");
+                        system("mogrify -resize 1280x1280 $path/$fileName");
                     }
                 }
+                exit;
 
             default:
                 http_response_code(400);
@@ -433,6 +430,7 @@ function checkUserPassword($conn, $email, $password)
                 return;
             }
         }
+        logger("User password check failed");
         http_response_code(403);
         print "{\"message\":\"REST: Bad password.\"}";
         exit;

iwsy/rest.php

@@ -2561,7 +2561,9 @@ const EasyCoder_Browser = {
 					const response = event.target.responseText;
 					setProgress(0);
 					setStatus(``);
-					console.log(response);
+					if (response) {
+						console.log(response);
+					}
 				}, false);
 				ajax.addEventListener(`error`, function () {
 					setStatus(`Upload failed`);