some cgi parsing

svn path=/trunk/; revision=3

diff --git a/cgi.sh b/cgi.sh
new file mode 100755 (executable)
index 0000000..cf0023c
--- /dev/null
+++ b/cgi.sh
@@ -0,0 +1,23 @@
+#!/bin/zsh
+
+declare -A _GET
+declare -A _POST
+
+
+cgi_get() {  # parse HTTP GET string
+  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"
+}
+
+cgi_post() {  # parse HTTP POST string
+  sed -u 1q |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:')"
+    _POST["$key"]="$(echo -e "$(echo "$val" |sed 's:+: :g;s:%:\\x:g')")"
+  done
+  debug "$_POST"
+}

diff --git a/index.cgi b/index.cgi
index 1188621ec86451107ef2bb07df205e895e6b428f..45602fcfc2895ab1785759c56afbe622766f8e8a 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -10,8 +10,8 @@ debug() { #change to false to disable debugging
 }
 
 # 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
+# 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 _STOR
 call=$0
 real=$call
 # therefore we need to identify the code and data directories _EXEC and _STOR
 call=$0
 real=$call


@@ -23,12 +23,12 @@ _EXEC="$(dirname "$real")"  #execution directory
 _STOR="$(dirname "$call")"  #storage directory
 
 debug "Execution dir: $_EXEC"
 _STOR="$(dirname "$call")"  #storage directory
 
 debug "Execution dir: $_EXEC"

-debug "Storage dir: $_EXEC"
+debug "Storage dir: $_STOR"

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

-for each in "$_STOR"/{vcard,mappings}; do
+for each in "$_STOR"/{vcard,mappings,courses}; 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 +41,8 @@ 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
+. "$_EXEC/cgi.sh"
+
+cgi_get

 debug "$_GET"
 
 debug "$_GET"