X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=actions%2Fmeta.sh;h=ab46894708aa192a655a95af982f8f9f3f9402de;hb=c59fd5a4946c4d13fc1692e4561878a9bb2b3e17;hp=6de9f3890db1b8f77c9fbca22dd464a45d34fc9a;hpb=f6d9912760f1c53189c0928ef58a7ff6a158a768;p=serve0

diff --git a/actions/meta.sh b/actions/meta.sh
index 6de9f38..ab46894 100755
--- a/actions/meta.sh
+++ b/actions/meta.sh
@@ -1,43 +1,58 @@
 #!/bin/zsh
+# Copyright 2014 - 2016 Paul Hänsch
+#
+# This file is part of Serve0
+#
+# Serve0 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,
+# 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/>.
 
-info="$_GET[\"i\"]"
-order="$_GET[\"o\"]"
-search="$_GET[\"s\"]"
-filter="$_GET[\"f\"]"
-page="$_GET[\"p\"]"
+cgi_refdata
+
+  info="${_GET[i]:-$_REF[i]}"
+ order="${_GET[o]}"
+search="${_GET[s]}"
+filter="${_GET[f]}"
+  page="${_GET[pn]}"
 file="${_DATA}/meta/$info.meta"
 
-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"
+length="${_POST[length]}"
+ width="${_POST[width]}"
+height="${_POST[height]}"
+ trash="${_POST[trash]}"
+cancel="${_POST[cancel]}"
+tagacc="${_POST[tag]}"
+tags="$(htmlsafe "${_POST[tags]}" |sed -r 's:\t: :g;s:^!|[\r\$\^\|]::g;' |tr '\n' '|')"
+description="$(htmlsafe "${_POST[description]}")"
+
+n=0; while [ -n "${_POST[tag$n]}" ]; do
+  tagacc="$(htmlsafe ${_POST[tag$n]} |sed -r '2,$d;s:\t| :_:g;s:^!|\r|\$|\^::g;')|$tagacc"
   n=$(($n + 1))
 done
 
-[ -z "$cancel" ] && if [ -n "$trash" ]; 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 >>"$file"
-  echo -e "${description}" >> "$file"
+  cat >$file <<EOF
+${length}	${width}	${height}	${info}
+${tagacc}|${tags}
+${description}
+EOF
   rm "${_DATA}/cache/$info.cache" 2>/dev/null
   rm ${_DATA}/cache/\?* 2>/dev/null
-  rm ${_DATA}/cache/taglist 2>/dev/null
+  rm ${_DATA}/cache/taglist_set ${_DATA}/cache/taglist_filter 2>/dev/null
 fi
 
-echo -n "Location: ?i=&p=${page}&s=${search}&f=${filter}&o=${order}#$info\n\n"
+redirect "${_POST[referrer]:-?i=&pn=${page}&s=${search}&f=${filter}&o=${order}#${info}}"