refactoring card display

[confetti] / index.cgi

diff --git a/index.cgi b/index.cgi
index b34c95976e65e98fcdd2a836f4f54c70cdfd29c2..cf70a45297a8c8c1afaeb4967ddb25a8d86dcc30 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -1,71 +1,31 @@
-#!/bin/zsh
-
-# Copyright 2014 Paul Hänsch
-#
-# This file is part of Confetti.
-# 
-# Confetti is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Confetti is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-# 
-# You should have received a copy of the GNU Affero General Public License
-# along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
-
-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
-}
-
-# 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,mappings}; do
-  [ ! -e "$each" ] && mkdir "$each"
-  [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
-done
-touch "$_DATA/mappings/attendance"
-
-# 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"
+#!/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#/}")"; ITEM="${ITEM#/}"
+ACTION="$(GET a)"
+
+if [ -d "${_EXEC}/${ITEM%%/*}" -a -x "${_EXEC}/${ITEM%%/*}/main.cgi" ]; then
+  . "${_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" ]; then
+#   . "$_EXEC/cgilite/file.sh"
+#   FILE "${_EXEC}/$ITEM"
 else
-  . "$_EXEC/page.sh"
+  printf 'Status: 404 Not Found\r\nContent-Length: 0\r\n\r\n'
 fi