error pages 409 and 500

[shellwiki] / themes / default.sh
diff --git a/themes/default.sh b/themes/default.sh

index 022a29ab4985bbad8dd05a8624fdbae6dc6084d9..36710dbd44e8194f6fd6fad0dba0dfc60e4ef4f9 100755 (executable)
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -93,10 +93,19 @@ theme_attachments(){
    local page="$1" title
    title="${page%/}"; title="${title##*/}"
  
+  if [ ! "$(mdfile "$page")" ]; then
+    theme_404
+    return 0
+  elif ! acl_read "$page"; then
+    theme_403
+    return 0
+  fi
+
    # Important! Web Server response including newline
    printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
  
-  cat <<-EOF
+  if acl_write "$page"; then
+    cat <<-EOF
         <!DOCTYPE HTML>
         <html><head>
           $(theme_head)
@@ -105,10 +114,38 @@ theme_attachments(){
           $(theme_header)
           <main>
             <form class=upload method=POST enctype="multipart/form-data">
+             <input type=hidden name=session_id value="$SESSION_ID">
               <input type=file name=file multiple>
               <button type=submit name=action value=upload>Upload</button>
             </form>
  
+            <form method=POST><ul class="attachment list">
+             <input type=hidden name=session_key value="$SESSION_KEY">
+           $(for file in "$_EXEC/pages/$page/#attachments"/* "$_DATA/pages/$page/#attachments"/*; do
+             [ "$file" = "$_EXEC/pages/$page/#attachments/${file##*/}" \
+                   -a -f "$_DATA/pages/$page/#attachments/${file##*/}" ] && continue
+             stat="$(stat -c '%s %Y' -- "$file" 2>&-)" || continue
+             size="${stat% *}" date="${stat#* }"
+           
+             printf '<li><button type=submit name=delete value="%s">Delete</button><a class=name href="%s">%s</a>
+                     <span class=size>%s</span><span class=date>%s</span></li>' \
+               "$(HTML "${file##*/}")" "$(HTML "${file##*/}")" "$(HTML "${file##*/}")" \
+               "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
+           done)
+            </ul></form>
+         </main>
+         $(theme_footer)
+       </body></html>
+       EOF
+  else
+    cat <<-EOF
+       <!DOCTYPE HTML>
+       <html><head>
+         $(theme_head)
+         <title>Attachments $(HTML "${title}")</title>
+       </head><body id="$(HTML "$page")[attachment]/">
+         $(theme_header)
+         <main>
              <ul class="attachment list">
             $(for file in "$_EXEC/pages/$page/#attachments"/* "$_DATA/pages/$page/#attachments"/*; do
               [ "$file" = "$_EXEC/pages/$page/#attachments/${file##*/}" \
@@ -116,15 +153,16 @@ theme_attachments(){
               stat="$(stat -c '%s %Y' -- "$file" 2>&-)" || continue
               size="${stat% *}" date="${stat#* }"
             
-             printf '<li><span class=name>%s</span>
+             printf '<li><a class=name href="%s">%s</a>
                       <span class=size>%s</span><span class=date>%s</span></li>' \
-               "$(HTML "${file##*/}")" "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
+               "$(HTML "${file##*/}")" "$(HTML "${file##*/}")" "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
             done)
              </ul>
           </main>
           $(theme_footer)
         </body></html>
         EOF
+  fi
  }
  
  theme_login(){
@@ -154,3 +192,23 @@ theme_404(){
      printf "Content-Length: 0\r\n\r\n"
    fi
  }
+
+theme_409(){
+  printf "%s\r\n" "Status: 409 Conflict"
+
+  if [ "$(mdfile '/[wiki]/409/')" ]; then
+    theme_page '/[wiki]/409/'
+  else
+    printf "Content-Length: 0\r\n\r\n"
+  fi
+}
+
+theme_500(){
+  printf "%s\r\n" "Status: 500 Internal Server Error"
+
+  if [ "$(mdfile '/[wiki]/500/')" ]; then
+    theme_page '/[wiki]/500/'
+  else
+    printf "Content-Length: 0\r\n\r\n"
+  fi
+}