omit empty pages from display

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

index 022a29ab4985bbad8dd05a8624fdbae6dc6084d9..0d60fb34a4144846925a50dbc54ebd716381e602 100755 (executable)
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -23,10 +23,10 @@ theme_page(){
    title="${page%/}"; title="${title##*/}"
  
    if [ ! "$(mdfile "$page")" ]; then
-    theme_404
+    theme_error 404
      return 0
    elif ! acl_read "$page"; then
-    theme_403
+    theme_error 403
      return 0
    fi
  
@@ -60,11 +60,8 @@ theme_editor(){
    local page="$1" title
    title="${page%/}"; title="${title##*/}"
  
-  if [ ! "$(mdfile "$page")" ]; then
-    theme_404
-    return 0
-  elif ! acl_write "$page"; then
-    theme_403
+  if ! acl_write "$page"; then
+    theme_error 403
      return 0
    fi
  
@@ -93,10 +90,19 @@ theme_attachments(){
    local page="$1" title
    title="${page%/}"; title="${title##*/}"
  
+  if [ ! "$(mdfile "$page")" ]; then
+    theme_error 404
+    return 0
+  elif ! acl_read "$page"; then
+    theme_error 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 +111,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,40 +150,31 @@ 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
-}
-
-theme_login(){
-  theme_page '/[wiki]/login/'
-}
-
-theme_register(){
-  theme_page '/[wiki]/register/'
-}
-
-theme_403(){
-  printf "%s\r\n" "Status: 403 Forbidden"
-
-  if [ "$(mdfile '/[wiki]/403/')" ]; then
-    theme_page '/[wiki]/403/'
-  else
-    printf "Content-Length: 0\r\n\r\n"
    fi
  }
  
-theme_404(){
-  printf "%s\r\n" "Status: 404 Not Found"
+theme_error(){
+  local errno="$1"
+
+  case $errno in
+    400) printf "%s\r\n" "Status: 400 Bad Request";;
+    403) printf "%s\r\n" "Status: 403 Forbidden";;
+    404) printf "%s\r\n" "Status: 404 Not Found";;
+    409) printf "%s\r\n" "Status: 409 Conflict";;
+    500) printf "%s\r\n" "Status: 500 Internal Server Error";;
+  esac
  
-  if [ "$(mdfile '/[wiki]/404/')" ]; then
-    theme_page '/[wiki]/404/'
+  if [ "$(mdfile "/[wiki]/$errno/")" ]; then
+    theme_page "/[wiki]/$errno/"
    else
      printf "Content-Length: 0\r\n\r\n"
    fi