omit listing of empty courses and vcards

[confetti] / index.cgi

diff --git a/index.cgi b/index.cgi
index 7dfe9fd9353b2524f30beff93abe8ddad68e78cb..276965f66dcab5ff0846aedf81afe68b4f560a09 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -3,11 +3,16 @@
 for n in "$@"; do case ${n%%=*} in
   data) _DATA="${n#data=}";;
   exec) _EXEC="${n#exec=}";;
 for n in "$@"; do case ${n%%=*} in
   data) _DATA="${n#data=}";;
   exec) _EXEC="${n#exec=}";;

-  noerr) exec 2>&-;;
+  base) _BASE="${n#base=}";;
+  debug) DEBUG="${n#debug=}";;

 esac; done
 
 esac; done
 

-[ -z "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}"
-[ -z "${_DATA%/}" ] && _DATA=. || _DATA="${_DATA%/}"
+[ ! "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}"
+[ ! "${_DATA%/}" ] && _DATA="${PWD%/}" || _DATA="${_DATA%/}"
+_BASE="${_BASE%/}"
+[ "$DEBUG" ] && exec 2>>"$DEBUG"
+
+mkdir -p "${_DATA}/cache" "${_DATA}/mappings" "${_DATA}/export" "${_DATA}/lock" "${_DATA}/ical" "${_DATA}/vcard"

 
 debug() {
   local dbg=/dev/stderr
 
 debug() {
   local dbg=/dev/stderr


@@ -23,7 +28,10 @@ debug() {
 . "$_EXEC/cgilite/cgilite.sh"
 . "$_EXEC/cgilite/session.sh"
 
 . "$_EXEC/cgilite/cgilite.sh"
 . "$_EXEC/cgilite/session.sh"
 

+. "$_EXEC/l10n.sh"
+

 _PATH="$(PATH "/${PATH_INFO}")"
 _PATH="$(PATH "/${PATH_INFO}")"

+_PATH="${_PATH#${_BASE}}"

 ACTION="$(GET a)"
 
 message="$(COOKIE message)"
 ACTION="$(GET a)"
 
 message="$(COOKIE message)"


@@ -47,15 +55,16 @@ yield_page() {
        [html [head
           [title Confetti]
          [meta name="viewport" content="width=device-width"]
        [html [head
           [title Confetti]
          [meta name="viewport" content="width=device-width"]

-         [link rel="stylesheet" type="text/css" href="/style.css"]
-    '
+         [link rel="stylesheet" type="text/css" href="%s/cgilite/common.css"]
+         [link rel="stylesheet" type="text/css" href="%s/style.css"]
+    ' "${_BASE}" "${_BASE}"

     [ -n "$style" ] && printf '
          [link rel="stylesheet" type="text/css" href="%s"]
     ' "$style"
     printf '
        ] [body #top class="%s"
     ' "$class"
     [ -n "$style" ] && printf '
          [link rel="stylesheet" type="text/css" href="%s"]
     ' "$style"
     printf '
        ] [body #top class="%s"
     ' "$class"

-    printf '[ul .menu [li [a "/cards/" . %s]][li [a "/courses/" . %s]]]' "$(l10n cards)" "$(l10n courses)"
+    printf '[ul .menu [li [a "%s/cards/" . %s]][li [a "%s/courses/" . %s]]]' "${_BASE}" "$(l10n cards)" "${_BASE}" "$(l10n courses)"

     [ "$message" ] && printf '[p #message\n%s\n]' "$(l10n "$message")"
     cat
     printf '] ]'
     [ "$message" ] && printf '[p #message\n%s\n]' "$(l10n "$message")"
     cat
     printf '] ]'


@@ -67,12 +76,12 @@ topdir="${_PATH#/}"
 topdir="/${topdir%%/*}"
 
 case ${_PATH} in
 topdir="/${topdir%%/*}"
 
 case ${_PATH} in

-  /) REDIRECT /cards/
+  "/") REDIRECT "${_BASE}/cards/"

     ;;
     ;;

-  /export/*.pdf) . "$_EXEC/cgilite/file.sh"
+  "/export"/*.pdf) . "$_EXEC/cgilite/file.sh"

     FILE "${_DATA}/${_PATH}" "application/pdf"
     ;;
     FILE "${_DATA}/${_PATH}" "application/pdf"
     ;;

-  /export/*) . "$_EXEC/cgilite/file.sh"
+  "/export"/*) . "$_EXEC/cgilite/file.sh"

     FILE "${_DATA}/${_PATH}"
     ;;
   *)
     FILE "${_DATA}/${_PATH}"
     ;;
   *)