X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=index.cgi;h=12f59b299db03c715539a229c965f0e63e73cc59;hp=427307118ba657f56ceb7e6bad18087393e6a897;hb=e6309da8eba1d1474b98aa2d4723a10747d808b0;hpb=bd9f9ebbf0add55cbba9d47691aad87504284570

diff --git a/index.cgi b/index.cgi
index 4273071..12f59b2 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,53 +1,46 @@
-#!/bin/zsh
-
-export LC_ALL=de_DE.UTF-8
-
-# basic functions
-die() {
-  echo "$*" >/dev/stderr
-  exit 1
-}
-debug() { #change to false to disable debugging
-  #true && echo "$*" >>debug
-  true && [ -n "$*" ] && echo -E "$*" >>/dev/stderr
-  true && [ -z "$*" ] && tee /dev/stderr
+#!/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"
+
+_PATH="$(PATH "/${PATH_INFO}")"
+ACTION="$(GET a)"
+
+yield_page() {
+  local class="$1" style="$2"
+  printf 'Content-Type: text/html; charset=utf-8\r\n\r\n'
+  { printf '
+	[html [head
+	  [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 class="%s"
+    ' "$class"
+    cat
+    printf '] ]'
+  } \
+  | "${_EXEC}/cgilite/html-sh.sed"
 }
 
-# this program is supposed to be symlinked into a http root directory
-# we will use the http root as object storage (data directory) 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 _DATA
-call="$0"
-real="$(readlink -f $call)"
-_EXEC="$(dirname "$real")"  #execution directory
-_DATA="$(dirname "$call")"  #storage directory
-
-[ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
-
-# create directories for object storage
-for each in "$_DATA"/{vcard,ical,cache,temp}; 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"
-
-. "$_EXEC/cgi.sh"
-
-cgi_get
-
-. "$_EXEC/constants.sh"
-
-if [ -n "$_GET[\"action\"]" ]; then
-  . "$_EXEC/action.sh"
-elif [ -n "$_GET[\"export\"]" ]; then
-  . "$_EXEC/export.sh"
+if   [   -d "${_EXEC}/${_PATH}" -a -x "${_EXEC}/${_PATH}/main.cgi" ]; then
+  . "${_EXEC}/${_PATH}/main.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}"
 else
-  . "$_EXEC/page.sh"
+  printf 'Status: 404 Not Found\r\nContent-Length: 0\r\n\r\n'
 fi