cleanup for simplified backlinking

svn path=/trunk/; revision=177

diff --git a/actions/multitag.sh b/actions/multitag.sh
index 3c9848e8cf938b8365560f24313fdb274f48151a..36f396680af3435393f1180b21d5066ed5c8d206 100755 (executable)
--- a/actions/multitag.sh
+++ b/actions/multitag.sh
@@ -1,5 +1,5 @@
 #!/bin/zsh
-# Copyright 2014 - 2016 Paul Hänsch
+# Copyright 2014 - 2017 Paul Hänsch
 #
 # This file is part of Serve0
 #
@@ -16,10 +16,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Serve0  If not, see <http://www.gnu.org/licenses/>.
 
-filter="${_POST[f]}"
-search="${_POST[s]}"
-order=$(validate "${_POST[o]}" 'Name|Date|Length' Name)
-page=$(validate "${_POST[pn]}" '[0-9]+' 1)
+backlink="${_POST[page]}"
 
 addtag(){
   meta="$1"
@@ -64,5 +61,4 @@ done
 rm "${_DATA}"/cache/\?* 2>/dev/null
 [ -n "${_POST[tags]}" ] && rm "${_DATA}"/cache/taglist_set "${_DATA}"/cache/taglist_filter 2>/dev/null
 
-#redirect "?o=$order&s=$search&f=$filter&pn=$page"
-redirect "${_POST[page]}"
+redirect "$backlink"

diff --git a/templates/browse.html.sh b/templates/browse.html.sh
index eae9ce9caf59f376a666d113ad0a14c7c29076ea..7f28f83c64ac0ee5c5b8a104538ba383d4b908a5 100755 (executable)
--- a/templates/browse.html.sh
+++ b/templates/browse.html.sh
@@ -48,10 +48,6 @@ cat <<EOF
 
   <form action="?action=multitag" method="post" accept-charset="UTF-8">
     <input type="hidden" name="page" value="?$(attribsafe "${page_this}")">
-    <input type="hidden" name="o" value="${order}">
-    <input type="hidden" name="s" value="${search}">
-    <input type="hidden" name="f" value="${filter}">
-    <input type="hidden" name="pn" value="${page}">
 
     <ul id="thumblist">
 EOF

diff --git a/templates/list.html.sh b/templates/list.html.sh
index 28ce6c503e3bc12a3befc9150ecd8ffaa8dbbcd8..144ad0e69f0a1d81620df98b2998a3d6afedda7e 100755 (executable)
--- a/templates/list.html.sh
+++ b/templates/list.html.sh
@@ -1,4 +1,4 @@
-# Copyright 2014 - 2016 Paul Hänsch
+# Copyright 2014 - 2017 Paul Hänsch
 #
 # This file is part of Serve0
 # 
@@ -48,10 +48,6 @@ cat <<EOF
 
   <form action="?action=multitag" method="post" accept-charset="UTF-8">
     <input type="hidden" name="page" value="?$(attribsafe "${page_this}")">
-    <input type="hidden" name="o" value="${order}">
-    <input type="hidden" name="s" value="${search}">
-    <input type="hidden" name="f" value="${filter}">
-    <input type="hidden" name="pn" value="${page}">
 
     <ul id="thumblist">
 EOF