X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=0d60fb34a4144846925a50dbc54ebd716381e602;hb=277d06327a184eb1fb72ba46fd8a3194c9c37362;hp=022a29ab4985bbad8dd05a8624fdbae6dc6084d9;hpb=f9cfcde441afed9d6db96e201935b6208903046d;p=shellwiki
diff --git a/themes/default.sh b/themes/default.sh
index 022a29a..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
@@ -93,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)
@@ -105,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##*/}" \
@@ -116,40 +150,31 @@ 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
-}
-
-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"
+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]/404/')" ]; then
- theme_page '/[wiki]/404/'
+ if [ "$(mdfile "/[wiki]/$errno/")" ]; then
+ theme_page "/[wiki]/$errno/"
else
printf "Content-Length: 0\r\n\r\n"
fi