introduced additional functions

[cgilite] / index.cgi

diff --git a/index.cgi b/index.cgi
index 9c068b54435e49f0d723e318b71a265f796be681..61073454582d8d8a9212491dd4c221fa2ddaa3f3 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -18,8 +18,6 @@
 # along with shcgi.  If not, see <http://www.gnu.org/licenses/>. 
 
 export LC_ALL=C LANG=C
-DBG_ENABLED=false
-DBG_FILE=/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
@@ -30,54 +28,18 @@ real="$(readlink -f $call)"
 _DATA="$(dirname "$call")"  #storage directory
 _EXEC="${real%/shcgi/index.cgi}"  #execution directory
 
+. "$_EXEC/shcgi/misc.sh"
 # put debug options in the local.opts file
+. "$_EXEC/shcgi/debug.sh"
 [ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
 
-# basic functions
-debug() { #change to false to disable debugging
-  if [ "$DBG_ENABLED" = true -a -n "$*" ]; then
-    echo -E "$@" >>"$DBG_FILE"
-  elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then
-    tee -a "$DBG_FILE"
-  elif [ -z "$*" ]; then
-    cat
-  fi
-}
-
-die() {
-  debug "$@"
-  echo -E "$@" >>/dev/stderr
-  exit 1
-}
-
-data_dirs(){
-  # create directories for object storage
-
-  [ -d "$_DATA" -a -w "$_DATA" ] || die "storage directory must be writable"
-  for each in "$@"; do
-    [ ! -e "$_DATA/$each" ] && mkdir "$_DATA/$each"
-    [ -d "$_DATA/$each" -a -w "$_DATA/$each" ] || die "storage \"$_DATA/$each\" must be a writable directory"
-  done
-}
-
-# create htaccess file
-[ -f "$_DATA/.htaccess" ] || cat >"$_DATA/.htaccess" <<EOF
-Options                +ExecCGI
-AddHandler     cgi-script .cgi
-DirectoryIndex index.cgi
-EOF
-[ -f "$_DATA/.htaccess" ] || die "no htaccess file present and unable to create one"
-
 . "$_EXEC/shcgi/cgi.sh"
-
 cgi_get
 
-[ -x "$_EXEC/constants.sh" ] && . "$_EXEC/constants.sh"
+[ -x "$_EXEC/globals.sh" ] && . "$_EXEC/globals.sh"
 
-if [ -n "$_GET[\"action\"]" ]; then
+if [ -n "${_GET[action]}" ]; then
   . "$_EXEC/shcgi/action.sh"
-elif [ -n "$_GET[\"export\"]" ]; then
-  . "$_EXEC/shcgi/export.sh"
 else
   . "$_EXEC/shcgi/page.sh"
 fi