X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=8367f92f7bd4ab31e8de6d8569e35bc4fc3588f6;hb=515c2d0ff3d2858990a1d8343467191b8484268f;hp=4dbd1150a063ba93b4b5717f16c2e9cbcf8e401e;hpb=915841ffcd76d15c1a6e503d6b14ec740abeac3e;p=serve0

diff --git a/index.cgi b/index.cgi
index 4dbd115..8367f92 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+for n in "$@"; do case ${n%%=*} in
+  data) _DATA="${n#data=}";;
+  exec) _exec="${n#exec=}";;
+  noerr) exec 2>&-;;
+esac; done
+
 [ -z "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}"
 [ -z "${_DATA%/}" ] && _DATA=. || _DATA="${_DATA%/}"
 
@@ -12,8 +18,9 @@ SEARCH="$(GET s)"
 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#/}")"
+ACTION="$(GET a)"
 
-case $(GET a) in
+case $ACTION in
   setprefs)
     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)"
@@ -26,7 +33,7 @@ case $(GET a) in
 
     s="$(POST search |STRING)"; f="$(POST filter |STRING)"
     if LOCK "$bm"; then
-      grep -m1 -avF "	search=$s	filter=$f${CR}" "$bm" >"$bm.tmp"
+      grep -avF "	search=$s	filter=$f${CR}" "$bm" >"$bm.tmp"
       [ ! "$(POST delete)" ] \
       && printf '%s	search=%s	filter=%s\r\n' \
 	        "$(POST name |STRING)" "$s" "$f" >>"$bm.tmp"
@@ -42,7 +49,7 @@ if [ "$ITEM" = "/style.css" ]; then
   [ -r "$_DATA/$ITEM" ] && FILE "$_DATA/$ITEM" \
                         || FILE "$_EXEC/style.css"
 elif [ -f "$_DATA/$ITEM" ]; then
-  case $(GET a) in
+  case $ACTION in
     tag)
     ;;
     thumbnail)
@@ -56,25 +63,27 @@ elif [ -f "$_DATA/$ITEM" ]; then
     delete)
     ;;
     *) . "$_EXEC/cgilite/file.sh"
-      FILE "$_DATA/$ITEM"
+      fakemp4="$(COOKIE fakemp4)"
+      FILE "$_DATA/$ITEM" "$([ "$fakemp4" = yes ] && printf 'video/mp4')"
     ;;
   esac
 elif [ -d "$_DATA/$ITEM" ]; then
-  case $(GET a) in
+  case $ACTION in
     advsearch)
       . "$_EXEC/advsearch.sh"
     ;;
-    spawnindex)
-      if [ "$(POST recursive)" = yes ]; then
-        find "$_DATA/$ITEM" -depth -type d \! -name .index \
-                            -exec mkdir -p '{}'/.index \;
-      else
-        mkdir -p "$_DATA/$ITEM/.index"
-      fi
-      REDIRECT "$(POST ref)"
-    ;;
     multitag)
+      if [ "$(POST spawn)" = spawn ]; then
+        case "$(POST recursive)" in
+          yes) find "$_DATA/$ITEM" \
+                    -depth -type d \! -name .index \
+                    -exec mkdir -p '{}'/.index \;
+          ;;
+          *) mkdir -p "$_DATA/$ITEM/.index";;
+        esac
+      else
       . "$_EXEC/multitag.sh"
+      fi
       REDIRECT "$(POST ref)"
     ;;
     *) . "$_EXEC/list.sh"