Allow control over CDN mode

Author: graham-trott

iwsy/resources/ecs/blocks.txt

@@ -39,25 +39,21 @@
     variable Args
     variable Protocol
     variable Domain
-    variable Resources
-    variable Properties
+    variable IsHome
     variable CDN
 
     json parse url the location as Args
     put property `protocol` of Args into Protocol
     put property `domain` of Args into Domain
-
-	rest get Properties from Protocol cat Domain cat `/easycoder-properties.json`
-    if Properties is not empty
-    begin
-    	put property `resources` of Properties into Resources
-    end
-    if Resources is empty
+    if Domain is `iwannashowyou.com`
     begin
-    	put `resources` into Resources
     	put `https://easycoder.github.io/iwsy/resources` into CDN
+    	set IsHome
+    end
+    else
+    	put Protocol cat Domain cat `/resources` into CDN
+    	clear IsHome
     end
-    else put Protocol cat Domain cat `/` cat Resources into CDN
 
     put -1 into SelectedBlock
 
@@ -297,4 +293,4 @@ SaveSelectedBlock:
     set property `action` of Message to `refresh`
     set property `source` of Message to `blocks`
     send Message to parent
-	return
+	return

iwsy/resources/ecs/fileman.txt

@@ -42,21 +42,19 @@
     variable N
     variable Even
     variable Args
-    variable Protocol
     variable Domain
-    variable Properties
-    variable UserPath
-    variable Resources
-    variable Message
+    variable IsHome
+    variable Item
     variable Post
 
     json parse url the location as Args
-    put property `protocol` of Args into Protocol
     put property `domain` of Args into Domain
-	rest get Properties from Protocol cat Domain cat `/easycoder-properties.json`
-   	put property `path` of Properties into UserPath
-    put property `resources` of Properties into Resources
-    if Resources is empty put `resources` into Resources
+    if Domain is `iwannashowyou.com` set IsHome 
+    else clear IsHome
+!	If the debug flag is set use admin storage
+    get Item from storage as `debug`
+    if Item is `true` clear IsHome
+    get AdminPassword from storage as `.password`
 
     if portrait
     begin
@@ -139,36 +137,25 @@
 Show:
     set style `display` of Container to `block`
 
-	if UserPath
-    begin
-    	put UserPath cat `/images` into Home
-    end
-    else
+	if IsHome
     begin
         get UserRecord from storage as `.user`
         put property `email` of UserRecord into Email
         get Password from storage as `user.password`
         put property `home` of UserRecord into Home
-        put Home cat `/` cat property `id` of UserRecord cat `/images` into Home
-        put `users/` cat Home into Home
+        put `users/` cat Home cat `/` cat property `id` of UserRecord into Home
+        put Home cat `/images` into Home
     end
+    else put `images` into Home
     get CurrentPath from storage as `.filepath`
     if CurrentPath is empty put Home into CurrentPath
-    get AdminPassword from storage as `.password`
 
 !	Build the list
 Browser:
     put CurrentPath into storage as `.filepath`
-    if UserPath
+    if IsHome
     begin
-        if AdminPassword is empty
-        begin
-            set Message to object
-            set property `Action` of Message to `password`
-            send Message to parent
-            stop
-        end
-        rest get Content from `list/` cat AdminPassword 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.`
             put empty into storage as `.filepath`
@@ -177,7 +164,7 @@ Browser:
     end
     else
     begin
-        rest get Content from `ulist/` cat Email cat `/` cat Password cat `/` cat CurrentPath cat `?v=` cat now
+        rest get Content from `list/` cat AdminPassword cat `/` cat CurrentPath cat `?v=` cat now
         or begin
             alert `Failed to list files.`
             put empty into storage as `.filepath`
@@ -243,8 +230,8 @@ Browser:
         if FileCount is 0
         begin
             put Path into CurrentPath
-            if UserPath put `delete/` cat AdminPassword cat `/` cat CurrentPath into Post
-            else put `udelete/` cat Email cat `/` cat Password cat `/` cat CurrentPath into Post
+            if IsHome put `udelete/` cat Email cat `/` cat Password cat `/` cat CurrentPath into Post
+            else put `delete/` cat AdminPassword cat `/` cat CurrentPath into Post
             rest post to Post or
             begin
                 alert `Failed to delete a file.`
@@ -286,8 +273,8 @@ SelectFile:
         set the text of URL to `resources/` cat FilePath
         on click DeleteButton
         begin
-            if UserPath put `delete/` cat AdminPassword cat `/` cat FilePath into Post
-            else put `udelete/` cat Email cat `/` cat Password cat `/` cat FilePath into Post
+            if IsHome put `udelete/` cat Email cat `/` cat Password cat `/` cat FilePath into Post
+            else put `delete/` cat AdminPassword cat `/` cat FilePath into Post
             rest post to Post or
             begin
                 alert `Failed to delete the image.`
@@ -315,13 +302,13 @@ Upload:
     else
     begin
         put CurrentPath into Path
-        if UserPath put `upload/` cat AdminPassword cat `/` cat Path into Path
-        else put `uupload/` cat Password cat `/` cat Email cat `/` cat Password cat `/` cat Path into Path
+        if IsHome put `uupload/` cat Password cat `/` cat Email cat `/` cat Password cat `/` cat Path into Path
+        else put `upload/` cat AdminPassword cat `/` cat Path into Path
         upload UploadFile to Path with UploadProgress and UploadStatus
         goto Browser
     end
     stop
 
 Exit:
     set style `display` of Container to `none`
-    stop
+    stop

iwsy/resources/ecs/help.txt

@@ -25,25 +25,24 @@
     variable Args
     variable Protocol
     variable Domain
-    variable Resources
-    variable Properties
+    variable IsHome
     variable CDN
 
     json parse url the location as Args
     put property `protocol` of Args into Protocol
     put property `domain` of Args into Domain
-
-	rest get Properties from Protocol cat Domain cat `/easycoder-properties.json`
-    if Properties is not empty
-    begin
-    	put property `resources` of Properties into Resources
-    end
-    if Resources is empty
+    if Domain is `iwannashowyou.com`
     begin
-    	put `resources` into Resources
     	put `https://easycoder.github.io/iwsy/resources` into CDN
+    	set IsHome
     end
-    else put Protocol cat Domain cat `/` cat Resources into CDN
+    else
+    	put Protocol cat Domain cat `/resources` into CDN
+    	clear IsHome
+    end
+!	If the debug flag is set use admin storage
+    get Item from storage as `debug`
+    if Item clear IsHome
 
     if portrait
     begin
@@ -207,4 +206,4 @@ ProcessEmbed:
 
 Exit:
     set style `display` of Container to `none`
-    stop
+    stop