X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=3c5f2a1819a000277c06dc31451a2013f1335812;hb=190657ed71861114213d0bd8128bd157a69f17ff;hp=8a73756030730af1e4cf7208fc4209d59a0eb21b;hpb=5b4d04c7e10daa59f4c28c541e37e37e82c4fb55;p=shellwiki diff --git a/themes/default.sh b/themes/default.sh index 8a73756..3c5f2a1 100755 --- 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 @@ -57,14 +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_403 + 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" "" @@ -75,9 +77,10 @@ theme_editor(){ $(HTML "${title}") $(theme_header) -
+
- +
@@ -91,10 +94,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 @@ -179,9 +182,3 @@ theme_error(){ 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; }