X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=3c5f2a1819a000277c06dc31451a2013f1335812;hb=a813ef1a99c1fac2ae7aaa5711622e58f4eb16e6;hp=6fa6ba16566245e9e7c0b92b883a155bf9ad4a19;hpb=ed4cab85e95f1eb70badbc3a22a493b5924d8e7e;p=shellwiki
diff --git a/themes/default.sh b/themes/default.sh
index 6fa6ba1..3c5f2a1 100755
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -22,6 +22,14 @@ theme_page(){
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" ""
@@ -33,12 +41,14 @@ theme_page(){
$(theme_header)
-
+ $(acl_write "$page" && printf %s \
+ ''
+ )
- $(wiki "$page" || printf 'Page not found')
+ $(wiki "$page" || printf 'Error while loading page
function "wiki" of index.sh returned with an error.')
$(theme_footer)
@@ -47,9 +57,16 @@ theme_page(){
}
theme_editor(){
- local page="$1" title
+ local page="$1" template="$2" title
title="${page%/}"; title="${title##*/}"
+ if ! acl_write "$page"; then
+ theme_error 403
+ return 0
+ fi
+
+ [ "$template" ] && acl_read "$template" || template="$page"
+
# Important! Web Server response including newline
printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
@@ -60,9 +77,10 @@ theme_editor(){
$(HTML "${title}")
$(theme_header)
-
$(theme_footer)
EOF
+ fi
}
-theme_login(){
- theme_page '[wiki]/login/'
-}
-
-theme_register(){
- theme_page '[wiki]/register/'
-}
-
-theme_404(){
- printf "%s\r\n" "Status: 404 Not Found"
-
- theme_page '[wiki]/404/'
+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]/$errno/")" ]; then
+ theme_page "/[wiki]/$errno/"
+ else
+ printf "Content-Length: 0\r\n\r\n"
+ fi
}