X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=cgi.sh;h=2a6c93091d82bac3044364b3db96fc5b27b4d32b;hp=439773015f82e103c2459e32b5059faa8e401205;hb=7baad0fc1db205353fe7414d358b43a015ef5848;hpb=daa2cb2e7deb218330a74e609642830de221bbf5

diff --git a/cgi.sh b/cgi.sh
index 4397730..2a6c930 100755
--- a/cgi.sh
+++ b/cgi.sh
@@ -24,35 +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;')")"
     n=''
-    if [ -n "${_POST[$key$n]}" ]; then
+    if [ -n "${_POST[$key$n]+x}" ]; then
       n=0
-      while [ -n "${_POST[$key$n]}" ]; do n=$(($n + 1)); done
+      while [ -n "${_POST[$key$n]+x}" ]; do n=$(($n + 1)); done
     fi
     _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')")"
@@ -70,20 +70,25 @@ 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(){