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 6de9f3890db1b8f77c9fbca22dd464a45d34fc9a..10b188fef0bdab35f217fe5e299fd7a7f635429e 100755 (executable)
--- a/actions/meta.sh
+++ b/actions/meta.sh
@@ -4,7 +4,7 @@ info="$_GET[\"i\"]"
 order="$_GET[\"o\"]"
 search="$_GET[\"s\"]"
 filter="$_GET[\"f\"]"
-page="$_GET[\"p\"]"
+page="$_GET[\"pn\"]"
 file="${_DATA}/meta/$info.meta"
 
 cgi_post
@@ -25,7 +25,7 @@ n=0; while [ -n "$_POST[\"tag$n\"]" ]; do
   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
@@ -40,4 +40,4 @@ else
   rm ${_DATA}/cache/taglist 2>/dev/null
 fi
 
-echo -n "Location: ?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"