X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Ffilter_card.sh;h=e7d1114a2deb3077c0bfe10584ed3dea044d4962;hp=10ca51b8eb34a0ca26253960c608875cb9e69d32;hb=a6e3da877a73be739ac96b12d9cde2190b24a423;hpb=5ab459e666f2526f671fe222cd1646a4e6798b27

diff --git a/cards/filter_card.sh b/cards/filter_card.sh
index 10ca51b..e7d1114 100755
--- a/cards/filter_card.sh
+++ b/cards/filter_card.sh
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 
 # Copyright 2014, 2017, 2019 Paul Hänsch
 #
@@ -17,26 +17,33 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
-if [ "$(POST choice)" = new_filter ]; then
-  filter="$(
-    seq 0 100 |while read n; do
-      filter_type="$(POST "filter_type${n}")"
-      filter_text="$(POST "filter_text${n}")"
-      [ ! "$filter_type" -a ! "$filter_text"  ] && break
-      if [ "$filter_type" = CATEGORIES ]; then
-        printf '^CATEGORIES:'
-        seq 0 $(POST_COUNT filter_cat$n) |while read m; do
-          printf '|%s' "$(POST filter_cat$n $m)"
-        done
-      else
-        printf '^%s:%s' "$filter_type" "$filter_text"
-      fi
-    done | sed -r \
-           's;\|+;\|;g;   s;\^+;\^;g;   s;:\|;:;g;
-            :X;   s;\^[^:]*:\^;\^;g;   /\^[^:]*:\^/bX;
-            s;^\^;;;   s;\^[^:]*:$;;;'
-  )"
-  REDIRECT "/cards/?o=$(POST order)&f=${filter}"
-else
-  REDIRECT '/cards/'
-fi
+filter="$(
+  seq 0 100 |while read n; do
+    filter_type="$(POST "filter_type${n}")"
+    filter_text="$(POST "filter_text${n}")"
+    [ ! "$filter_type" -a ! "$filter_text"  ] && break
+    if [ "$filter_type" = CATEGORIES ]; then
+      printf '^CATEGORIES:'
+      seq 0 $(POST_COUNT filter_cat$n) |while read m; do
+        printf '|%s' "$(POST filter_cat$n $m)"
+      done
+    else
+      printf '^%s:%s' "$filter_type" "$filter_text"
+    fi
+  done | sed -E \
+         's;\|+;\|;g;   s;\^+;\^;g;   s;:\|;:;g;
+          :X;   s;\^[^:]*:\^;\^;g;   /\^[^:]*:\^/bX;
+          s;^\^;;;   s;\^[^:]*:$;;;'
+)"
+
+case $(POST choice) in
+  filter)
+    REDIRECT "/cards/?o=$(POST order)&f=${filter}"
+    ;;
+  new_filter)
+    REDIRECT "/cards/?o=$(POST order)&f=${filter}&newfilter=yes"
+    ;;
+  *)
+    REDIRECT '/cards/'
+    ;;
+esac