bug fix using tempfile, allow +-Buttons for add field

[confetti] / index.cgi

diff --git a/index.cgi b/index.cgi
index cf70a45297a8c8c1afaeb4967ddb25a8d86dcc30..5dc55be28dab259b079cb0e6d247249e0f93cdc8 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -2,30 +2,80 @@
 
 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"
 
-FILTER="$(GET filter)"
-ORDER="$(GET o |grep -m1 -axE 'firstname|lastname|bdate' || printf firstname)"
-# LISTSIZE="$(COOKIE pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
-ITEM="$(PATH "${PATH_INFO#/}")"; ITEM="${ITEM#/}"
+_PATH="$(PATH "/${PATH_INFO}")"
 ACTION="$(GET a)"
 
-if [ -d "${_EXEC}/${ITEM%%/*}" -a -x "${_EXEC}/${ITEM%%/*}/main.cgi" ]; then
-  . "${_EXEC}/${ITEM%%/*}/main.cgi"
-elif [ "$ITEM" = "style.css" ]; then
+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 Confetti]
+         [meta name="viewport" content="width=device-width"]
+         [link rel="stylesheet" type="text/css" href="/style.css"]
+    '
+    [ -n "$style" ] && printf '
+         [link rel="stylesheet" type="text/css" href="%s"]
+    ' "$style"
+    printf '
+       ] [body #top class="%s"
+    ' "$class"
+    cat
+    [ "$message" ] && printf '[p #message\n%s\n]' "$(l10n "$message")"
+    printf '] ]'
+  } \
+  | "${_EXEC}/cgilite/html-sh.sed"
+}
+
+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"
-  [ -r "$_DATA/$ITEM" ] && FILE "$_DATA/$ITEM" \
-                        || FILE "$_EXEC/style.css"
-# elif [ -d "${_EXEC}/${ITEM%%/*}" -a ! -x "${_EXEC}/$ITEM" ]; then
-#   . "$_EXEC/cgilite/file.sh"
-#   FILE "${_EXEC}/$ITEM"
+  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