X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=0d60fb34a4144846925a50dbc54ebd716381e602;hb=6cbf25e916de4d4d70daf9a924302de9ca7c20f3;hp=1830e26673ccd60c29e95a85f446143cce3dd18c;hpb=f3d22dba45391ab591b38159a52cfa7cb803a03c;p=shellwiki
diff --git a/themes/default.sh b/themes/default.sh
index 1830e26..0d60fb3 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)
@@ -50,6 +60,11 @@ theme_editor(){
local page="$1" title
title="${page%/}"; title="${title##*/}"
+ if ! acl_write "$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" ""
@@ -75,10 +90,19 @@ 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)
@@ -87,10 +111,38 @@ theme_attachments(){
$(theme_header)
+
+
+ $(theme_footer)
+
+ EOF
+ else
+ 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##*/}" \
@@ -98,27 +150,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
}