X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=0d60fb34a4144846925a50dbc54ebd716381e602;hb=277d06327a184eb1fb72ba46fd8a3194c9c37362;hp=36710dbd44e8194f6fd6fad0dba0dfc60e4ef4f9;hpb=4d35c26aaac2a8738a8831118671d7a70dca827c;p=shellwiki diff --git a/themes/default.sh b/themes/default.sh index 36710db..0d60fb3 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 @@ -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 @@ -165,49 +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_404(){ - printf "%s\r\n" "Status: 404 Not Found" - - if [ "$(mdfile '/[wiki]/404/')" ]; then - theme_page '/[wiki]/404/' - 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_error(){ + local errno="$1" -theme_500(){ - printf "%s\r\n" "Status: 500 Internal Server Error" + 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]/500/')" ]; then - theme_page '/[wiki]/500/' + if [ "$(mdfile "/[wiki]/$errno/")" ]; then + theme_page "/[wiki]/$errno/" else printf "Content-Length: 0\r\n\r\n" fi