move functions to tools

[shellwiki] / themes / default.sh

diff --git a/themes/default.sh b/themes/default.sh
index 7edd4b9986c60ad8e989f07a2740c7dc327d7c48..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
 
@@ -94,10 +91,10 @@ theme_attachments(){
   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
 
@@ -114,11 +111,13 @@ 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
@@ -163,29 +162,19 @@ theme_attachments(){
   fi
 }
 
-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_error(){
+  local errno="$1"
 
-theme_404(){
-  printf "%s\r\n" "Status: 404 Not Found"
+  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