simplified filter mechanism

[serve0] / actions / filter.sh

diff --git a/actions/filter.sh b/actions/filter.sh
index 32f867daf826ba1e4c72aff97b7c09a8560db66c..ea0f85cc78d5d6220c08d81adaec9fde11d61688 100755 (executable)
--- a/actions/filter.sh
+++ b/actions/filter.sh
@@ -14,19 +14,11 @@ for fn in {0..9}; do
     egrep -q '(^|\^|\||!)$' <<<"$filters" || filters="${filters}^"
   fi
 
-  n=''
-  while [ -n "$_POST[\"filter${fn}_$n\"]" ]; do
-    filter="$(echo "$_POST[\"filter${fn}_$n\"]" |sed 's/\t/ /g;s/\r//g;s/\\/\\\\/g' |head -n1)"
-    egrep -q '(^|\^|\||!)$' <<<"${filters}" || filters="${filters}|"
-    filters="${filters}${filter}"
-    [ -z "$n" ] && n=0 || n=$(($n + 1))
-  done
-
   n=''
   while [ -n "$_POST[\"cfilter${fn}_$n\"]" ]; do
     cfilter="$(echo "$_POST[\"cfilter${fn}_$n\"]" |sed 's/\t/ /g;s/\r//g;s/\\/\\\\/g' |head -n1)"
     egrep -q '(^|\^|\||!)$' <<<"${filters}" || filters="${filters}|"
-    filters="${filters}${category}:${cfilter}"
+    [ "$category" = "none" ] && filters="${filters}${cfilter}" || filters="${filters}${category}:${cfilter}"
     [ -z "$n" ] && n=0 || n=$(($n + 1))
   done
 done