rename p attribute to pn, and use p for cgi page name instead

[serve0] / actions / meta.sh

diff --git a/actions/meta.sh b/actions/meta.sh
index b5fbe518f370c047d44e990b7b3e648da3a96088..10b188fef0bdab35f217fe5e299fd7a7f635429e 100755 (executable)
--- a/actions/meta.sh
+++ b/actions/meta.sh
@@ -1,54 +1,43 @@
 #!/bin/zsh
 
 info="$_GET[\"i\"]"
-file="{$DATA}/meta/$info.meta"
+order="$_GET[\"o\"]"
+search="$_GET[\"s\"]"
+filter="$_GET[\"f\"]"
+page="$_GET[\"pn\"]"
+file="${_DATA}/meta/$info.meta"
 
-if [ -n "${CONTENT_LENGTH}" -a "${CONTENT_LENGTH}" -gt 0 ]; then
-(head -c "${CONTENT_LENGTH}"; echo)|sed 's/&/\n/g' |while read line; do
-  if (egrep -xq 'length=[0-9]{1,5}' <<<"${line}"); then
-    length="$(cut -d= -f2 <<<"${line}")"
-  elif (egrep -xq 'width=[0-9]{1,5}' <<<"${line}"); then
-    width="$(cut -d= -f2 <<<"${line}")"
-  elif (egrep -xq 'height=[0-9]{1,5}' <<<"${line}"); then
-    height="$(cut -d= -f2 <<<"${line}")"
-  elif (egrep -xq 'tag=.+' <<<"${line}"); then
-    tag="$(sed -r 's:^tag=(.*)$:\1:;s:\+:_:g;s:%:\\x:g' <<<"$line")"
-    tag="$(echo -e "${tag}" |sed -r 's:\t| :_:g;s:^!|\r|\$|\^::g;s:\\:\\\\:g;s/</\&lt\;/g;s/>/\&gt\;/g')"
-    tagacc="$tag|$tagacc"
-  elif (egrep -xq 'tags=.+' <<<"${line}"); then
-    tags="$(sed -r 's:^tags=(.*)$:\1:;s:\+:_:g;s:%:\\x:g' <<<"$line")"
-    tags="$(echo -e "${tags}" |sed -r 's:\t| :_:g;s:^!|\r|\$|\^::g;s:\\:\\\\:g;s/</\&lt\;/g;s/>/\&gt\;/g')"
-  elif (egrep -xq 'description=.+' <<<"${line}"); then
-    description="$(cut -d= -f2- <<<"${line}" |sed 's/+/ /g;s/%/\\x/g')"
-    description="$(echo -e "${description}" |sed 's/\r//g;s/\\/\\\\/g;s/</\&lt\;/g;s/>/\&gt\;/g')"
-  elif (egrep -xq 'trash=.+' <<<"${line}"); then
-    trash="true"
-  elif (egrep -xq 'cancel=.+' <<<"${line}"); then
-    cancel="true"
-  elif (egrep -xq 'f=.+' <<<"${line}"); then
-    filter="$(cut -d= -f2- <<<"${line}")"
-  elif (egrep -xq 's=.+' <<<"${line}"); then
-    search="$(cut -d= -f2- <<<"${line}")"
-  elif (egrep -xq 'p=.+' <<<"${line}"); then
-    page="$(cut -d= -f2- <<<"${line}")"
-  elif (egrep -xq 'o=.+' <<<"${line}"); then
-    order="$(cut -d= -f2- <<<"${line}")"
-  fi
+cgi_post
+length="$_POST[\"length\"]"
+width="$_POST[\"width\"]"
+height="$_POST[\"height\"]"
+trash="$_POST[\"trash\"]"
+cancel="$_POST[\"cancel\"]"
+tagacc="$_POST[\"tag\"]"
+tags="$(echo "$_POST[\"tags\"]" \
+        | sed -r 's:\t| :_:g;s:^!|\r|\$|\^::g;s:\\:\\\\:g;s/</\&lt\;/g;s/>/\&gt\;/g'
+)"
+description="$(echo -e "$_POST[\"description\"]" \
+               |sed 's/\r//g;s/\\/\\\\/g;s/</\&lt\;/g;s/>/\&gt\;/g'
+)"
+n=0; while [ -n "$_POST[\"tag$n\"]" ]; do
+  tagacc="$_POST[\"tag$n\"]|$tagacc"
+  n=$(($n + 1))
 done
-fi
 
-[ -z "$cancel" ] && if [ "$trash" = "true" ]; then
+[ -z "$cancel" -a -n "$info" ] && if [ -n "$trash" ]; then
   rm "${_DATA}/thumbs/$info.jpg" 2>/dev/null
   mv "${_DATA}/videos/$info" "${_DATA}/meta/$info.meta" "${_DATA}/trash/" 2>/dev/null
   rm "${_DATA}/cache/$info.cache" 2>/dev/null
   rm ${_DATA}/cache/\?* 2>/dev/null
 else
   echo -e "$length\t$width\t$height\t$info" > "$file"
-  echo -e "${tagacc}${tags}" |tr '\n' '|' >> "$file"
+  echo -e "${tagacc}|${tags}" |tr '\n' '|' >> "$file"
   echo >>"$file"
   echo -e "${description}" >> "$file"
   rm "${_DATA}/cache/$info.cache" 2>/dev/null
   rm ${_DATA}/cache/\?* 2>/dev/null
+  rm ${_DATA}/cache/taglist 2>/dev/null
 fi
 
-echo -n "Location: index.cgi?i=&p=${page}&s=${search}&f=${filter}&o=${order}#$info\n\n"
+echo -n "Location: ?i=&pn=${page}&s=${search}&f=${filter}&o=${order}#$info\n\n"