X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=index.cgi;h=f18743956e9607ce88fe019254b7fd67759c378a;hp=b34c95976e65e98fcdd2a836f4f54c70cdfd29c2;hb=ad105acdefe3a76de9abdfd3376527d1960bddc2;hpb=1e8f35fa92c610b540cbe365e2231194b58e0cc0

diff --git a/index.cgi b/index.cgi
index b34c959..f187439 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,71 +1,51 @@
-#!/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
+#!/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"
+. "$_EXEC/cgilite/session.sh"
+
+_PATH="$(PATH "/${PATH_INFO}")"
+ACTION="$(GET a)"
+
+message="$(COOKIE message)"
+[ "$message" ] && SET_COOKIE 0 message=''
+
+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
+    [ "$message" ] && printf '[p #message\n%s\n]' $(l10n "$message")
+    printf '] ]'
+  } \
+  | "${_EXEC}/cgilite/html-sh.sed"
 }
-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"
+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