pagination function

[serve0] / index.cgi

diff --git a/index.cgi b/index.cgi
index 94309f3305a50b3690311c0e6a1cbc433fa755b8..7b4921a4878ac806d06bbebf83c508c451dd7853 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -1,45 +1,44 @@
 #!/bin/sh
 
-[ -z "${_EXEC%/}" ] && _EXEC=. || _EXEC="${_DATA%/}"
+[ -z "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}"
 [ -z "${_DATA%/}" ] && _DATA=. || _DATA="${_DATA%/}"
 
 . "$_EXEC/cgilite/cgilite.sh"
 . "$_EXEC/widgets.sh"
 
-filter="$(GET f)"
-search="$(GET s)"
-order="$(GET o |grep -m1 -xE 'Date|Name|Length' || printf Name)"
-pagesize="$(COOKIE pagesize |grep -m1 -xE '[1-9][0-9]*' || printf 50)"
-
-item="$(printf %s "${PATH_INFO#/}" |sed -r ':X /(^|\/)\.\.($|\/)/s;(^|[^/]*/)..(/|$);;; tX;')"
+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)"
+ITEM="$(PATH "${PATH_INFO#/}")"
 
 case $(GET a) in
   setprefs)
-    printf 'Status: 303 See Other\r\n'
     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)"
-    printf 'Location: %s\r\n\r\n' "$(POST ref)"
-    exit 0
+    REDIRECT "$(POST ref)"
   ;;
 esac
 
-if [ "$item" = "/style.css" ]; then
+if [ "$ITEM" = "/style.css" ]; then
   . "$_EXEC/cgilite/file.sh"
-  [ -r "$_DATA/$item" ] && FILE "$_DATA/$item" \
+  [ -r "$_DATA/$ITEM" ] && FILE "$_DATA/$ITEM" \
                         || FILE "$_EXEC/style.css"
-elif [ -f "$_DATA/$item" ]; then
+elif [ -f "$_DATA/$ITEM" ]; then
   case $(GET a) in
     tag)
     ;;
     thumbnail)
+      printf 'Status: 404 Not Found\r\nContent-Length 0:\r\n\r\n'
     ;;
     delete)
     ;;
     *) . "$_EXEC/cgilite/file.sh"
-      FILE "$_DATA/$item"
+      FILE "$_DATA/$ITEM"
     ;;
   esac
-elif [ -d "$_DATA/$item" ]; then
+elif [ -d "$_DATA/$ITEM" ]; then
   case $(GET a) in
     multitag)
     ;;
@@ -47,6 +46,5 @@ elif [ -d "$_DATA/$item" ]; then
     ;;
   esac
 else
-  printf 'Status: 404 Not Found\r\n\r\n'
-  exit 0
+  printf 'Status: 404 Not Found\r\nContent-Length 0:\r\n\r\n'
 fi