various -a flags for grep

[serve0] / index.cgi

diff --git a/index.cgi b/index.cgi
index 8790fa9b814edb4dc71cd01714859658fd8b51d6..1b305e4ce66f227edc56fde2331eb0b416706f72 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -6,19 +6,18 @@
 file_pattern='^.*\.(mov|ts|mpg|mpeg|mp4|m4v|avi|mkv|flv|sfv|wmv|ogm|ogv|webm|iso|rmvb)$'
 
 . "$_EXEC/cgilite/cgilite.sh"
-. "$_EXEC/widgets.sh"
 
 FILTER="$(GET f)"
 SEARCH="$(GET s)"
-ORDER="$(GET o |grep -m1 -xE 'Date|Name|Length' || printf Name)"
-LISTSIZE="$(COOKIE pagesize |grep -m1 -xE '[1-9][0-9]*' || printf 50)"
+ORDER="$(GET o |grep -m1 -axE 'Date|Name|Length' || printf Name)"
+LISTSIZE="$(COOKIE pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
 ITEM="$(PATH "${PATH_INFO#/}")"
 
 case $(GET a) in
   setprefs)
-    SET_COOKIE +$((86400 * 90)) pagesize="$(POST pagesize |grep -m1 -xE '[1-9][0-9]*' || printf 50)"
-    SET_COOKIE +$((86400 * 90))     mode="$(POST     mode |grep -m1 -xE 'browse|index' || printf browse)"
-    SET_COOKIE +$((86400 * 90))  fakemp4="$(POST  fakemp4 |grep -m1 -xE 'yes' || printf no)"
+    SET_COOKIE +$((86400 * 90)) pagesize="$(POST pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
+    SET_COOKIE +$((86400 * 90))     mode="$(POST     mode |grep -m1 -axE 'browse|index' || printf browse)"
+    SET_COOKIE +$((86400 * 90))  fakemp4="$(POST  fakemp4 |grep -m1 -axE 'yes' || printf no)"
     REDIRECT "$(POST ref)"
   ;;
 esac
@@ -34,7 +33,7 @@ elif [ -f "$_DATA/$ITEM" ]; then
     thumbnail)
       . "$_EXEC/cgilite/file.sh"
       index="$_DATA/${ITEM%/*}/.index"
-      thumb="$index/${ITEM##*/}.jpg"
+      thumb="$index/${ITEM##*/}"; thumb="${thumb%.*}.jpg"
       [ -d "$index" -a \! -f "$thumb" ] \
       && file="$_DATA/$ITEM" . "$_EXEC/thumbnail.sh"
       FILE "$thumb"
@@ -47,6 +46,9 @@ elif [ -f "$_DATA/$ITEM" ]; then
   esac
 elif [ -d "$_DATA/$ITEM" ]; then
   case $(GET a) in
+    advsearch)
+      . "$_EXEC/advsearch.sh"
+    ;;
     spawnindex)
       if [ "$(POST recursive)" = yes ]; then
         find "$_DATA/$ITEM" -depth -type d \! -name .index \