X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=index.cgi;h=907041ee6395a89e4979b34e71b44bea47c124e5;hp=b406bc9e827ff43b36e19bf6d7cd9a48efd01614;hb=f53f3103ded9696b19666f32620642172ffa9c09;hpb=2030c27378891fc2d26091303269f7b9c228611b

diff --git a/index.cgi b/index.cgi
index b406bc9..907041e 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014, 2015 Paul Hänsch
+# Copyright 2014 - 2016 Paul Hänsch
 #
 # This file is part of shcgi.
 # 
@@ -25,20 +25,38 @@ export LC_ALL=C LANG=C
 # therefore we need to identify the code and data directories _EXEC and _DATA
 call="$0"
 real="$(readlink -f $call)"
-_DATA="$(dirname "$call")"  #storage directory
-_EXEC="${real%/shcgi/index.cgi}"  #execution directory
+export _DATA="$(dirname "$call")"  #storage directory
+export _EXEC="${real%/shcgi/index.cgi}"  #execution directory
 
-. "$_EXEC/shcgi/misc.sh"
 # put debug options in the local.opts file
+. "$_EXEC/shcgi/misc.sh"
 . "$_EXEC/shcgi/debug.sh"
 [ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
 
+if [ "$1" = '--server' -o  "$1" = '--inetd' -o "$1" = '--ncat' ]; then
+  . "$_EXEC/shcgi/server.sh" $@
+else
+  HTTP_format(){ cat }
+fi
+
 . "$_EXEC/shcgi/cgi.sh"
 
 [ -x "$_EXEC/globals.sh" ] && . "$_EXEC/globals.sh"
 
-if [ -n "${_GET[action]}" ]; then
-  . "$_EXEC/shcgi/action.sh"
-else
+  PAGE=$(validate   "${PAGE:-${_GET[page]}}"   '[a-zA-Z0-9_-]+' '')
+ACTION=$(validate "${ACTION:-${_GET[action]}}" '[a-zA-Z0-9_-]+' '')
+STATIC=$(invalidate "${STATIC:-${_GET[static]}}" '(^|.*/)\.\./.*' '')
+
+if [ -n "$STATIC" ] && [ -e "${_EXEC}/static/${STATIC}" ]; then
+  . "$_EXEC/shcgi/static.sh" "$_EXEC/static/$STATIC"
+elif [ -n "$ACTION" ] && [ -x "${_EXEC}/actions/${ACTION}.sh" ]; then
+  . "${_EXEC}/actions/${ACTION}.sh"
+elif   [ -n "$PAGE" ] && [ -x "${_EXEC}/pages/${PAGE}.sh" ]; then
   . "$_EXEC/shcgi/page.sh"
-fi
+else
+  printf 'Status: 404 Not Found\r\n'
+  PAGE=error
+  [ -x "${_EXEC}/pages/${PAGE}.sh" ] \
+  && . "$_EXEC/shcgi/page.sh" \
+  || printf '\r\n'
+fi |HTTP_format $@