X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=3c5f2a1819a000277c06dc31451a2013f1335812;hb=12556f1bbca0a2a973c3cb305b191f3844f197cc;hp=6fa6ba16566245e9e7c0b92b883a155bf9ad4a19;hpb=cb3cd16be2190c7e91aa1dafd22b295b641c0d32;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) -
+
- +
@@ -75,10 +93,52 @@ theme_attachments(){ 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" "" - cat <<-EOF + if acl_write "$page"; then + cat <<-EOF + + + $(theme_head) + Attachments $(HTML "${title}") + + $(theme_header) +
+
+ + + +
+ +
    + + $(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 + stat="$(stat -c '%s %Y' -- "$file" 2>&-)" || continue + size="${stat% *}" date="${stat#* }" + + printf '
  • %s + %s%s
    • ' \ + "$(HTML "${file##*/}")" "$(HTML "${file##*/}")" "$(HTML "${file##*/}")" \ + "$(size_human "$size")" "$(date -d @"$date" +"%F %T")" + done) +
+
+ $(theme_footer) + + EOF + else + cat <<-EOF $(theme_head) @@ -93,27 +153,32 @@ theme_attachments(){ stat="$(stat -c '%s %Y' -- "$file" 2>&-)" || continue size="${stat% *}" date="${stat#* }" - printf '
  • %s + printf '
  • %s %s%s
    • ' \ - "$(HTML "${file##*/}")" "$(size_human "$size")" "$(date -d @"$date" +"%F %T")" + "$(HTML "${file##*/}")" "$(HTML "${file##*/}")" "$(size_human "$size")" "$(date -d @"$date" +"%F %T")" done)
    $(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 }