From: Paul Hänsch Date: Sat, 2 Jan 2021 09:02:41 +0000 (+0100) Subject: path handling and helper functions X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=583a91a8017f002897acc7aeaf01153b02f336b1;p=lobster path handling and helper functions --- diff --git a/index.cgi b/index.cgi index 093a5c4..9d74909 100755 --- a/index.cgi +++ b/index.cgi @@ -2,13 +2,24 @@ for n in "$@"; do case ${n%%=*} in data) _DATA="${n#data=}";; - exec) _exec="${n#exec=}";; + exec) _EXEC="${n#exec=}";; noerr) exec 2>&-;; esac; done [ -z "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}" [ -z "${_DATA%/}" ] && _DATA=. || _DATA="${_DATA%/}" +debug() { + local dbg=/dev/stderr + if [ ! "$DEBUG" ]; then + [ "$#" -gt 0 ] && : || cat; + elif [ "$#" -gt 0 ]; then + printf '%s\n' "$@" >>"$dbg" + else + tee -a "$dbg" + fi +} + . "$_EXEC/cgilite/cgilite.sh" . "$_EXEC/cgilite/session.sh" @@ -18,8 +29,16 @@ ACTION="$(GET a)" message="$(COOKIE message)" [ "$message" ] && SET_COOKIE 0 message='' -checked(){ [ "$1" = "$2" ] || [ "$1" -eq "$2" ] && printf 'checked="checked"' 2>/dev/null; } -selected(){ [ "$1" = "$2" ] || [ "$1" -eq "$2" ] && printf 'selected="selected"' 2>/dev/null; } +checked(){ + if [ "$1" = "$2" ] || [ "$1" -eq "$2" ]; then + printf 'checked="checked"' + fi 2>/dev/null +} +selected(){ + if [ "$1" = "$2" ] || [ "$1" -eq "$2" ]; then + printf 'selected="selected"' + fi 2>/dev/null +} yield_page() { local class="$1" style="$2" @@ -34,7 +53,7 @@ yield_page() { [link rel="stylesheet" type="text/css" href="%s"] ' "$style" printf ' - ] [body class="%s" + ] [body #top class="%s" ' "$class" cat [ "$message" ] && printf '[p #message\n%s\n]' $(l10n "$message") @@ -43,13 +62,20 @@ yield_page() { | "${_EXEC}/cgilite/html-sh.sed" } -if [ -d "${_EXEC}/${_PATH}" -a -x "${_EXEC}/${_PATH}/index.cgi" ]; then +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