allow empty fields in POST data

[cgilite] / cgi.sh

diff --git a/cgi.sh b/cgi.sh
index d9ee5bd012ed8b3780a4ed78ae75c8f82dda0d0a..2a6c93091d82bac3044364b3db96fc5b27b4d32b 100755 (executable)
--- a/cgi.sh
+++ b/cgi.sh
@@ -24,36 +24,35 @@ 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:')"
     val="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\2:')"
     value="$(printf "$(printf %s "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g;')")"
-    if [ -n "${_POST[$key]}" ]; then
+    n=''
+    if [ -n "${_POST[$key$n]+x}" ]; then
       n=0
-      while [ -n "${_POST[$key$n]}" ]; do n=$(($n + 1)); done
-      _POST[$key$n]="$value"
-    else
-      _POST[$key]="$value"
+      while [ -n "${_POST[$key$n]+x}" ]; do n=$(($n + 1)); done
     fi
-    debug "_POST[$key] => $value"
+    _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')")"
@@ -71,23 +70,42 @@ cgi_cookie() { # Parse GET data from referer
   done
 }
 
-urlsave(){
+urlsafe(){
   printf %s "$*" \
   | sed 's;%;%25;g;
-         s; ;%20;g;
-         s;!;%21;g;
-         s;";%22;g;
-         s;&;%26;g;
-         s;(;%28;g;
-         s;);%29;g;
-         s;:;%3a;g
+         s;\?;%3f;g;
+         s;#;%23;g;
          s;<;%3c;g;
          s;>;%3e;g;
-         s;'\'';%27;g;
-         s;\?;%3f;g;'
+         s;&;%26;g;
+         s;";%22;g;
+         s;'\'';%27;g;'
+}
+
+htmlsafe(){
+  printf %s "$*" \
+  | sed 's;<;\&lt\;;g;
+         s;>;\&gt\;;g;
+         s;&;\&amp\;;g;
+         s;";\&quot\;;g;
+         s;'\'';\&apos\;;g;'
 }
 
 redirect(){
   printf '%s\n\n' "Location: $*"
   exit 0
 }
+
+set_cookie(){
+  case "$1" in
+    session|0) expire='';;
+    ''|default)        expire="$(LANG=C date -d "+ 1 week" +'%a, %d %b %Y %T %Z')";;
+    *)         expire="$(LANG=C date -d "$1" +'%a, %d %b %Y %T %Z' 2>&-)";;
+  esac
+  cookie="$2"
+  
+  printf 'Set-Cookie: %s' "$cookie"
+  [ -n "$expire" ] && printf '; Expires=%s' "$expire" 
+  [ $# -ge 3 ] && shift 2 && printf '; %s' "$@"
+  printf '\n'
+}