X-Git-Url: http://git.plutz.net/?p=shcgi;a=blobdiff_plain;f=cgi.sh;h=37f4787dede71a492551a313863d6d92259399df;hp=c70c4d26cd841e0757d51b2c6833aa41baeeea58;hb=49831f4301899b008b94f590b4c9765f76b4c0f0;hpb=fa5c15e6e36107359d926ece94df2b614f37a37b

diff --git a/cgi.sh b/cgi.sh
index c70c4d2..37f4787 100755
--- a/cgi.sh
+++ b/cgi.sh
@@ -1,39 +1,44 @@
 #!/bin/zsh
 
-# Copyright 2014 Paul Hänsch
+# Copyright 2014,2015 Paul Hänsch
 #
-# This file is part of Serve0.
+# This file is part of shcgi.
 # 
-# Serve0 is free software: you can redistribute it and/or modify
+# shcgi is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # 
-# Serve0 is distributed in the hope that it will be useful,
+# shcgi is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
 # 
 # You should have received a copy of the GNU Affero General Public License
-# along with Serve0.  If not, see <http://www.gnu.org/licenses/>. 
+# along with shcgi.  If not, see <http://www.gnu.org/licenses/>. 
 
 declare -A _GET
 declare -A _POST
 declare -A _REF
 
+[ -z "$HTTP_REFERER" ] && HTTP_REFERER="./"
+
 cgi_get() {  # parse HTTP GET string
+  debug "== CGI DATA: 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')")"
+    key="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
+    val="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
+    _GET["$key"]="$(echo -e "$(echo -E "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")"
+    debug "_GET[$key] => $val"
   done
 }
 
 cgi_post() {  # parse HTTP POST string
+  debug "== CGI DATA: POST =="
   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:')"
-    value="$(echo -e "$(echo "$val" |sed 's:+: :g;s:%:\\x:g')")"
+    key="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
+    val="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
+    value="$(echo -e "$(echo -E "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g;')")"
     if [ -n "$_POST[\"$key\"]" ]; then
       n=0
       while [ -n "$_POST[\"$key$n\"]" ]; do n=$(($n + 1)); done
@@ -41,15 +46,17 @@ cgi_post() {  # parse HTTP POST string
     else
       _POST["$key"]="$value"
     fi
-    #debug "_POST[$key] => $value"
+    debug "_POST[$key] => $value"
   done
 }
 
 cgi_refdata() { # Parse GET data from referer
+  debug "== CGI DATA: REFERER =="
   echo "$HTTP_REFERER" |cut -d'?' -f2- |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:')"
-    _REF["$key"]="$(echo -e "$(echo "$val" |sed 's:+: :g;s:%:\\x:g')")"
+    key="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\1:')"
+    val="$(echo -E "$query" |sed -r 's:^([a-zA-Z0-9_-]*)=(.*)$:\2:')"
+    _REF["$key"]="$(echo -e "$(echo -E "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")"
+    debug "_REF[$key] => $val"
   done
 }