X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=index.cgi;h=e0bf125ec5c1ad6f4d7501d76cb5c3aaa09ae0f2;hp=1188621ec86451107ef2bb07df205e895e6b428f;hb=43e7c60df0632fd383306a2d3c6dc8c4213d4b9d;hpb=325336a63c383f6e40aeda8bec6896331a4408c3

diff --git a/index.cgi b/index.cgi
index 1188621..e0bf125 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,52 +1,31 @@
-#!/bin/zsh
-
-# basic functions
-die() {
-  echo "$*" >/dev/stderr
-  exit 1
-}
-debug() { #change to false to disable debugging
-  true && echo "$*" >>debug
-}
-
-# this program is supposed to be symlinked into a http root directory
-# we will use the http root as object storage and call sub programs
-# from the directory in which the real executable resides
-# therefore we need to identify the code and data directories _EXEC and _STOR
-call=$0
-real=$call
-while [ -L "$real" ]; do
-  real="$(stat -c %N "$real" |sed -r "s:..*. -> .(.*).$:\1:")"
-done
-
-_EXEC="$(dirname "$real")"  #execution directory
-_STOR="$(dirname "$call")"  #storage directory
-
-debug "Execution dir: $_EXEC"
-debug "Storage dir: $_EXEC"
-
-[ -w "$_EXEC" ] && [ -d "$_EXEC" ] || die "storage directory must be writable"
-
-# create directories for object storage
-for each in "$_STOR"/{vcard,mappings}; do
-  [ ! -e "$each" ] && mkdir "$each"
-  [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
-done
-
-# create htaccess file
-[ -f .htaccess ] || cat >.htaccess <<EOF
-Options		+ExecCGI
-AddHandler	cgi-script .cgi
-DirectoryIndex	index.cgi
-EOF
-[ -f .htaccess ] || die "no htaccess file present and unable to create one"
-
-# parse HTTP GET string
-declare -A _GET
-echo "$QUERY_STRING" |tr '&' '\n' |while read query; do
-  key="$(echo "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
-  val="$(echo "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
-  _GET["$key"]="$(echo -e "$(echo "$val" |sed 's:+: :g;s:%:\\x:g')")"
-done
-debug "$_GET"
-
+#!/bin/sh
+
+for n in "$@"; do case ${n%%=*} in
+  data) _DATA="${n#data=}";;
+  exec) _exec="${n#exec=}";;
+  noerr) exec 2>&-;;
+esac; done
+
+[ -z "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}"
+[ -z "${_DATA%/}" ] && _DATA=. || _DATA="${_DATA%/}"
+
+. "$_EXEC/cgilite/cgilite.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#/}")"
+ACTION="$(GET a)"
+
+if [ -d "${_EXEC}/${ITEM%%/*}/main.cgi" ]
+  . "${_EXEC}/${ITEM%%/*}/main.cgi"
+elif [ "$ITEM" = "/style.css" ]; then
+  . "$_EXEC/cgilite/file.sh"
+  [ -r "$_DATA/$ITEM" ] && FILE "$_DATA/$ITEM" \
+                        || FILE "$_EXEC/style.css"
+elif [ -d "${_EXEC}/${ITEM%%/*}" -a ! -x "${_EXEC}/$ITEM" ]
+  . "$_EXEC/cgilite/file.sh"
+  FILE "${_EXEC}/$ITEM"
+else
+  printf 'Status: 404 Not Found\r\nContent-Length: 0\r\n\r\n'
+fi