X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=57de2367ddc95a85850be7ab19b687f52115429a;hb=bec3776a5065a5026936ab2b7d77bbe60a52ddac;hp=3008c7d06dd74edc222cef130c778ac555ad983a;hpb=b31f5bb6683067a226232300f6ad0ed60c7d239d;p=lobster diff --git a/index.cgi b/index.cgi index 3008c7d..57de236 100755 --- a/index.cgi +++ b/index.cgi @@ -2,7 +2,7 @@ for n in "$@"; do case ${n%%=*} in data) _DATA="${n#data=}";; - exec) _exec="${n#exec=}";; + exec) _EXEC="${n#exec=}";; noerr) exec 2>&-;; esac; done @@ -15,11 +15,26 @@ esac; done _PATH="$(PATH "/${PATH_INFO}")" ACTION="$(GET a)" +message="$(COOKIE message)" +[ "$message" ] && SET_COOKIE 0 message='' + +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" printf 'Content-Type: text/html; charset=utf-8\r\n\r\n' { printf ' [html [head + [title Lobster] [meta name="viewport" content="width=device-width"] [link rel="stylesheet" type="text/css" href="/style.css"] ' @@ -30,18 +45,24 @@ yield_page() { ] [body class="%s" ' "$class" cat + [ "$message" ] && printf '[p #message\n%s\n]' $(l10n "$message") printf '] ]' } \ | "${_EXEC}/cgilite/html-sh.sed" } -if [ -d "${_EXEC}/${_PATH}" -a -x "${_EXEC}/${_PATH}/main.cgi" ]; then - . "${_EXEC}/${_PATH}/main.cgi" +topdir="${_PATH#/}" +topdir="/${topdir%%/*}" + +if [ -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