simplification and sanitizing

[serve0] / widgets.sh

diff --git a/widgets.sh b/widgets.sh
index 81807c05a74679fda1a83e03fff105d9711ef5ce..1b5f7708425a960b6d57e8496fa314e053964ec3 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -6,23 +6,30 @@ include_widgets="$0"
 . "$_EXEC/cgilite/storage.sh"
 
 w_refuri="$(HTML "$REQUEST_URI")"
+
 w_tags="$(find "$_DATA/" -path '*/.index/meta' -print0 \
         | xargs -r0 cut -f4 \
         | cut -d= -f2- |tr , '\n' | sort -u)"
 w_tags="$(UNSTRING "$w_tags")"
+w_tagcategories="$(printf %s "$w_tags" |cut -sd: -f1 |sort -u)"
+
+CHECK(){ [ "$1" = "$2" ] && printf checked; }
 
 w_search(){
   printf '
   [form #search method=GET action=?
     [select name=o size=1 
       [option disabled=disabled Order By]
-      [option value=Name Name]
-      [option value=Date Date]
-      [option value=Length Length]
+      [option value=Name %s Name]
+      [option value=Date %s Date]
+      [option value=Length %s Length]
     ]
     [input name=s placeholder=Search value="%s"]
   ]
   ' \
+  "$(CHECK "$ORDER" Name)" \
+  "$(CHECK "$ORDER" Date)" \
+  "$(CHECK "$ORDER" Length)" \
   "$(HTML "$SEARCH")"
 }
 
@@ -43,9 +50,9 @@ w_prefs(){
   ]
   ' \
   "$w_refuri" "$LISTSIZE" \
-  "$([ "$mode" = index ] || printf checked)" \
-  "$([ "$mode" = index ] && printf checked)" \
-  "$([ "$fakemp4" = yes    ] && printf checked)"
+  "$([ "$mode" = index  ] || CHECK)" \
+  "$(CHECK "$mode" index)" \
+  "$(CHECK "$fakemp4" yes)"
 }
 
 w_index(){
@@ -60,6 +67,9 @@ w_index(){
 }
 
 w_advsearch(){
+  local n lbid tag category tn filter f
+  filter="${FILTER}^"
+
   printf '[form #advsearch action=?a=advsearch method=POST
             [a href="#" Hide]
             [p .help Select multiple tags from each category by holding down the [strong Ctrl] key on your keyboard.[br]
@@ -68,38 +78,53 @@ w_advsearch(){
          ' "$w_refuri"
 
   for n in 1 2 3 4 5 6 7 8 9 10; do
+    f="${filter%%^*}"; filter="${filter#*^}"
+
     lbid="$(HTML "cat_${n}_(none)")"
-    printf '[input .and type=checkbox name=and id="and_%i"][label for="and_%i" +and
+    printf '[input .and type=checkbox name=and id="and_%i" %s][label for="and_%i" +and
             ][fieldset .select
-            [input .pol type="radio" name=pol_%i id="pol_pos_%i"][label for=pol_pos_%i Any]
-            [input .pol type="radio" name=pol_%i id="pol_neg_%i"][label for=pol_neg_%i None]
-            [label .head Category:]
-            [input .cat type=radio name="cat_%i" id="%s" ][label for="%s" %s]
-            [select name=tag_%s size=10 multiple' \
-            $n $n $n $n $n $n $n $n \
-            $n "$lbid" "$lbid" "(none)" $n
-    printf %s "$w_tags" |grep -vF ":" \
-    | while read -r tag; do
-      [ ! "$tag" ] && continue
-      printf '[option value="%s" %s]' "$(HTML "$tag")" "$(HTML "$tag")"
-    done
-    printf ']'
-    printf %s "$w_tags" |cut -sd: -f1 |sort -u \
+            [radio "pol_%i" "pos" .pol %s #pol_pos_%i"][label for=pol_pos_%i Any]
+            [radio "pol_%i" "neg" .pol %s #pol_neg_%i"][label for=pol_neg_%i None]
+            [label .head Category:]' \
+            $n "$([ "$f" ] && printf checked)" $n \
+            $n "$([ "$f" -a ! "${f%%~*}" ] || printf checked)" $n $n \
+            $n "$([ "$f" -a ! "${f%%~*}" ] && printf checked)" $n $n
+    f="|${f#~}|"
+
+    printf '*\n%s\n' "$w_tagcategories" \
     | while read -r category; do
-      lbid="$(HTML "cat_${n}_${category}")"
-      printf '[input .cat type=radio name="cat_%i" id="%s" [label for="%s" %s]]
-              [select name=tag_%s size=10 multiple' $n "$lbid" "$lbid" "$(HTML "$category")" $n
-      printf %s "$w_tags" |grep -wF "${category}" \
+      catn="$(HTML "$category")"
+      lbid="cat_${n}_${catn}"
+      printf '[radio "cat_%i" "%s" .cat id="%s" %s][label for="%s" %s]
+              [select name=tag_%s size=10 multiple' \
+              $n "$catn" "$lbid" \
+              "$([ ! "${f%%*|${category}:*}" -o ! "${category%\*}" ] && printf checked)" \
+              "$lbid" "$catn" $n
+
+      printf %s "$w_tags" \
+      | { [ "$category" = '*' ] && grep -vF ':' || grep -wF "${category}"; } \
       | while read -r tag; do
-        tag="$(HTML "$tag")"; tn="${tag#*:}"
-        printf '[option value="%s" %s]' "$tag" "$tn"
+        [ ! "$tag" ] && continue
+        tg="$(HTML "$tag")"; tn="${tg#*:}"
+        printf '[option %s value="%s"\n%s]' \
+          "$([ ! "${f%%*|${tag}|*}" ] && printf selected)" \
+          "$tg" "$tn"
       done
-      printf ']'
+      printf '\n]'
     done
     printf ']'
   done
 
-  printf ']'
+  printf '[fieldset .submit [select name=order
+            [option disabled=disabled Order By]
+            [option value=Name %s Name]
+            [option value=Date %s Date]
+            [option value=Length %s Length]
+          ][button type=submit Apply Filter]]
+          ]' \
+          "$(CHECK "$ORDER" Name)" \
+          "$(CHECK "$ORDER" Date)" \
+          "$(CHECK "$ORDER" Length)"
 }
 
 w_tagging(){
@@ -107,21 +132,15 @@ w_tagging(){
   printf '[div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
   printf '[a href="#" Hide][br]'
 
-  printf '[fieldset [legend %s:][select name=tag size=4 multiple' "Tags"
-  printf %s "$w_tags" |grep -vF ":" \
-  | while read -r tag; do
-    [ ! "$tag" ] && continue
-    printf '[option value="%s" %s]' "$(HTML "$tag")" "$(HTML "$tag")"
-  done
-  printf ']]'
-
-  printf %s "$w_tags" |cut -sd: -f1 |sort -u \
+  printf 'Tags\n%s\n' "$w_tagcategories" \
   | while read -r category; do
     printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$(HTML "$category")"
-    printf %s "$w_tags" |grep -wF "${category}" \
+    printf %s "$w_tags" \
+    | { [ "$category" = 'Tags' ] && grep -vF ':' || grep -wF "${category}"; } \
     | while read -r tag; do
+      [ ! "$tag" ] && continue
       tag="$(HTML "$tag")"; tn="${tag#*:}"
-      printf '[option value="%s" %s]' "$tag" "$tn"
+      printf '[option value="%s"\n%s]' "$tag" "$tn"
     done
     printf ']]'
   done