multiple logical fixes in vcard updater

[confetti] / index.cgi

diff --git a/index.cgi b/index.cgi
index 1188621ec86451107ef2bb07df205e895e6b428f..a7edbb1186378b7584e1e23e6b39a8f0aa906b19 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -6,13 +6,15 @@ die() {
   exit 1
 }
 debug() { #change to false to disable debugging
   exit 1
 }
 debug() { #change to false to disable debugging

-  true && echo "$*" >>debug
+  #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
 }
 
 # this program is supposed to be symlinked into a http root directory

-# we will use the http root as object storage 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 _STOR
+# 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=$call
 while [ -L "$real" ]; do
 call=$0
 real=$call
 while [ -L "$real" ]; do


@@ -20,15 +22,12 @@ while [ -L "$real" ]; do
 done
 
 _EXEC="$(dirname "$real")"  #execution directory
 done
 
 _EXEC="$(dirname "$real")"  #execution directory

-_STOR="$(dirname "$call")"  #storage directory
+_DATA="$(dirname "$call")"  #storage directory

 
 

-debug "Execution dir: $_EXEC"
-debug "Storage dir: $_EXEC"
-
-[ -w "$_EXEC" ] && [ -d "$_EXEC" ] || die "storage directory must be writable"
+[ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"

 
 # create directories for object storage
 
 # create directories for object storage

-for each in "$_STOR"/{vcard,mappings}; do
+for each in "$_DATA"/{vcard,mappings,courses,cache,temp}; do

   [ ! -e "$each" ] && mkdir "$each"
   [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
 done
   [ ! -e "$each" ] && mkdir "$each"
   [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
 done


@@ -41,12 +40,16 @@ DirectoryIndex      index.cgi
 EOF
 [ -f .htaccess ] || die "no htaccess file present and unable to create one"
 
 EOF
 [ -f .htaccess ] || die "no htaccess file present and unable to create one"
 

-# parse HTTP GET string
-declare -A _GET
-echo "$QUERY_STRING" |tr '&' '\n' |while read query; do
-  key="$(echo "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
-  val="$(echo "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
-  _GET["$key"]="$(echo -e "$(echo "$val" |sed 's:+: :g;s:%:\\x:g')")"
-done
-debug "$_GET"
+. "$_EXEC/cgi.sh"
+
+cgi_get
+
+. "$_EXEC/constants.sh"

 
 

+if [ -n "$_GET[\"action\"]" ]; then
+  . "$_EXEC/action.sh"
+elif [ -n "$_GET[\"export\"]" ]; then
+  . "$_EXEC/export.sh"
+else
+  . "$_EXEC/page.sh"
+fi