page selector layout

[shellwiki] / themes / default.sh

diff --git a/themes/default.sh b/themes/default.sh
index 36710dbd44e8194f6fd6fad0dba0dfc60e4ef4f9..8a73756030730af1e4cf7208fc4209d59a0eb21b 100755 (executable)
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -60,10 +60,7 @@ theme_editor(){
   local page="$1" title
   title="${page%/}"; title="${title##*/}"
 
-  if [ ! "$(mdfile "$page")" ]; then
-    theme_404
-    return 0
-  elif ! acl_write "$page"; then
+  if ! acl_write "$page"; then
     theme_403
     return 0
   fi
@@ -165,50 +162,26 @@ 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
 }
 
-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
-}
+theme_400(){ theme_error 400; }
+theme_403(){ theme_error 403; }
+theme_404(){ theme_error 404; }
+theme_409(){ theme_error 409; }
+theme_500(){ theme_error 500; }