parse get and post data automatically

[shcgi] / cgi.sh

diff --git a/cgi.sh b/cgi.sh
index 4f4cb509ed05458857209495f2d7d98e378dadbd..124496e0895ed11bce06279906cad9ed2c51c2b7 100755 (executable)
--- a/cgi.sh
+++ b/cgi.sh
@@ -24,17 +24,17 @@ declare -A _COOKIE
 
 [ -z "$HTTP_REFERER" ] && HTTP_REFERER="./"
 
-cgi_get() {  # parse HTTP GET string
-  debug "== CGI DATA: GET =="
-  printf '%s\n' "$QUERY_STRING" |tr '&' '\n' |while read query; do
-    key="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\1:')"
-    val="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\2:')"
-    _GET[$key]="$(printf "$(printf %s "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")"
-    debug "_GET[$key] => $val"
-  done
-}
+# parse HTTP GET string
+debug "== CGI DATA: GET =="
+printf '%s\n' "$QUERY_STRING" |tr '&' '\n' |while read query; do
+  key="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\1:')"
+  val="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\2:')"
+  _GET[$key]="$(printf "$(printf %s "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")"
+  debug "_GET[$key] => $val"
+done
 
-cgi_post() {  # parse HTTP POST string
+if [ "$REQUEST_METHOD" = POST ]; then
+  # parse HTTP POST string
   debug "== CGI DATA: POST =="
   sed -u 1q |tr '&' '\n' |while read query; do
     key="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\1:')"
@@ -48,11 +48,11 @@ cgi_post() {  # parse HTTP POST string
     _POST[$key$n]="$value"
     debug "_POST[$key$n] => $value"
   done
-}
+fi
 
 cgi_refdata() { # Parse GET data from referer
   debug "== CGI DATA: REFERER =="
-  printf '%s\n' "$HTTP_REFERER" |cut -d'?' -f2- |tr '&' '\n' |while read query; do
+  printf '%s\n' "${HTTP_REFERER#*\?}" |tr '&' '\n' |while read query; do
     key="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\1:')"
     val="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\2:')"
     _REF[$key]="$(printf "$(printf %s "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")"