removed debug marks

[confetti] / index.cgi

diff --git a/index.cgi b/index.cgi
index f0127826c0eb8f7210d5b7a9d54a0f19e91ca632..6bd36d5fbdecd916dccc949fd11ea293abe0798b 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -7,7 +7,8 @@ die() {
 }
 debug() { #change to false to disable debugging
   #true && echo "$*" >>debug
 }
 debug() { #change to false to disable debugging
   #true && echo "$*" >>debug

-  true && echo "$*" >>/dev/stderr
+  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


@@ -23,13 +24,10 @@ done
 _EXEC="$(dirname "$real")"  #execution directory
 _DATA="$(dirname "$call")"  #storage directory
 
 _EXEC="$(dirname "$real")"  #execution directory
 _DATA="$(dirname "$call")"  #storage directory
 

-debug "Execution dir: $_EXEC"
-debug "Storage dir: $_DATA"
-

 [ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
 
 # create directories for object storage
 [ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
 
 # create directories for object storage

-for each in "$_DATA"/{vcard,mappings,courses}; 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


@@ -45,6 +43,7 @@ EOF
 . "$_EXEC/cgi.sh"
 
 cgi_get
 . "$_EXEC/cgi.sh"
 
 cgi_get

-debug "$_GET"

 
 

-. "$_EXEC/page.sh"
+. "$_EXEC/constants.sh"
+
+[ -n "$_GET[\"action\"]" ] && . "$_EXEC/action.sh" || . "$_EXEC/page.sh"