global and improved pdi escaping functions

[lobster] / index.cgi

diff --git a/index.cgi b/index.cgi
index ef9c74778fab4626587dbb15727d35bec0420ec8..9d9a3e7090f3441b760c321d16407be17cb0e4e0 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -2,13 +2,23 @@
 
 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 [ "$#" -gt 0 ]; then
+#     printf '%s\n' "$@" >>"$dbg"
+#   else
+#     tee -a "$dbg"
+#   fi
+# }
+debug() { [ "$#" -gt 0 ] && : || cat; }
+
 . "$_EXEC/cgilite/cgilite.sh"
 . "$_EXEC/cgilite/session.sh"
 
@@ -18,8 +28,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"
@@ -43,13 +61,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