always write FN field; bugfix: use editing tempfile as basis for modifications, impor...

[confetti] / index.cgi

diff --git a/index.cgi b/index.cgi
index 9d74909e010eda7aaf914ffeb0ab5aba7a10cf51..ee0d6f7200900df4e43ba1a2347da90fca72006b 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -3,11 +3,14 @@
 for n in "$@"; do case ${n%%=*} in
   data) _DATA="${n#data=}";;
   exec) _EXEC="${n#exec=}";;
-  noerr) exec 2>&-;;
+  debug) DEBUG="${n#debug=}";;
 esac; done
 
-[ -z "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}"
-[ -z "${_DATA%/}" ] && _DATA=. || _DATA="${_DATA%/}"
+[ ! "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}"
+[ ! "${_DATA%/}" ] && _DATA=. || _DATA="${_DATA%/}"
+[ "$DEBUG" ] && exec 2>>"$DEBUG"
+
+mkdir -p "${_DATA}/cache" "${_DATA}/mappings" "${_DATA}/export" "${_DATA}/lock" "${_DATA}/ical" "${_DATA}/vcard"
 
 debug() {
   local dbg=/dev/stderr
@@ -23,6 +26,8 @@ debug() {
 . "$_EXEC/cgilite/cgilite.sh"
 . "$_EXEC/cgilite/session.sh"
 
+. "$_EXEC/l10n.sh"
+
 _PATH="$(PATH "/${PATH_INFO}")"
 ACTION="$(GET a)"
 
@@ -55,8 +60,9 @@ yield_page() {
     printf '
        ] [body #top class="%s"
     ' "$class"
+    printf '[ul .menu [li [a "/cards/" . %s]][li [a "/courses/" . %s]]]' "$(l10n cards)" "$(l10n courses)"
+    [ "$message" ] && printf '[p #message\n%s\n]' "$(l10n "$message")"
     cat
-    [ "$message" ] && printf '[p #message\n%s\n]' $(l10n "$message")
     printf '] ]'
   } \
   | "${_EXEC}/cgilite/html-sh.sed"
@@ -65,17 +71,27 @@ yield_page() {
 topdir="${_PATH#/}"
 topdir="/${topdir%%/*}"
 
-if [ "${_PATH}" = / ]; then
-  REDIRECT /cards/
-elif   [   -d "${_EXEC}/${_PATH}" -a -x "${_EXEC}/${_PATH}/index.cgi" ]; then
-  . "${_EXEC}/${_PATH}/index.cgi"
-elif [ ! -d "${_EXEC}/${_PATH}" -a -x "${_EXEC}/${_PATH}" ]; then
-  . "${_EXEC}/${_PATH}"
-elif [ ! -x "${_EXEC}/${_PATH}" -a -r "${_EXEC}/${_PATH}" ]; then
-  . "$_EXEC/cgilite/file.sh"
-  FILE "${_EXEC}/${_PATH}"
-elif   [   -d "${_EXEC}/${topdir}" -a -x "${_EXEC}/${topdir}/index.cgi" ]; then
-  . "${_EXEC}/${topdir}/index.cgi"
-else
-  printf 'Status: 404 Not Found\r\nContent-Length: 0\r\n\r\n'
-fi
+case ${_PATH} in
+  /) REDIRECT /cards/
+    ;;
+  /export/*.pdf) . "$_EXEC/cgilite/file.sh"
+    FILE "${_DATA}/${_PATH}" "application/pdf"
+    ;;
+  /export/*) . "$_EXEC/cgilite/file.sh"
+    FILE "${_DATA}/${_PATH}"
+    ;;
+  *)
+    if   [ -d "${_EXEC}/${_PATH}" -a -x "${_EXEC}/${_PATH}/index.cgi" ]; then
+      . "${_EXEC}/${_PATH}/index.cgi"
+    elif [ -f "${_EXEC}/${_PATH}" -a -x "${_EXEC}/${_PATH}" ]; then
+      . "${_EXEC}/${_PATH}"
+    elif [ -f "${_EXEC}/${_PATH}" -a -r "${_EXEC}/${_PATH}" ]; then
+      . "$_EXEC/cgilite/file.sh"
+      FILE "${_EXEC}/${_PATH}"
+    elif [ -d "${_EXEC}/${topdir}" -a -x "${_EXEC}/${topdir}/index.cgi" ]; then
+      . "${_EXEC}/${topdir}/index.cgi"
+    else
+      printf '%s\r\n' 'Status: 404 Not Found' 'Content-Length: 0' ''
+    fi
+    ;;
+esac