introduced page size cookie; globalised some input validation

[serve0] / pages / common.sh

diff --git a/pages/common.sh b/pages/common.sh
index efb61fdb99039f878ff922a00420517c24dab675..9926badff68669956584c94c11ddc298cd86f684 100755 (executable)
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -19,17 +19,17 @@
 
 filter="${_GET[f]}"
 search="${_GET[s]}"
-order=$(echo -E "${_GET[o]}" |egrep '^(Name|Date|Length)$')
-page=$(echo -E "${_GET[pn]}" |egrep '^[0-9]+$')
-[ -z "$page" ] && page=0
+order="${_GET[o]}" #validated
+page="${_GET[pn]}" #validated
+pagesize="${_COOKIE[pagesize]}" #validated
 
 page_link=''
 [ -n "$info" ]   && page_link="i=$(urlsave "$info")&"
 [ -n "$order" ]  && page_link="${page_link}o=${order}&"
 [ -n "$search" ] && page_link="${page_link}s=${search}&"
 [ -n "$filter" ] && page_link="${page_link}f=${filter}&"
-page_prev="${page_link}pn=$([ "$page" = 0 ] && echo 0 || echo $(($page - 1)) )"
-page_next="${page_link}pn=$(($page + 1))"
+page_prev="${page_link}pn=$([ "$page" -le "$pagesize" ] && echo 1 || echo $(($page - $pagesize)) )"
+page_next="${page_link}pn=$(($page + $pagesize))"
 page_this="${page_link}pn=$page"
 
 taglist=$(
@@ -85,12 +85,12 @@ genlist(){
   case "$order" in
     Date)   ls -c ${_DATA}/videos/ |egrep -i "$file_pattern";;
     Length) sed -sn 1p "${_DATA}/meta/"*.meta |sort -n |sed -r 's;^[0-9\t]+\t;;';;
-    *)      printf '%s\n' "${_DATA}/meta/"*meta |sed -r 's;^.*/;;;s;\.meta$;;';;
+    Name)   printf '%s\n' "${_DATA}/meta/"*meta |sed -r 's;^.*/;;;s;\.meta$;;';;
   esac
 }
 
 thumblist() {
-  cache="${_DATA}/cache/?o=${order}&s=${search}&f=${filter}&pn=${page}"
+  cache="${_DATA}/cache/${pagesize}?o=${order}&s=${search}&f=${filter}&pn=${page}"
   if [ "$cache" -nt ${_DATA}/videos -a "$cache" -nt ${_DATA}/meta ]; then
     cat "$cache"
   else
@@ -112,7 +112,7 @@ thumblist() {
     else
       cat
     fi \
-    | sed -n "$(($page * $pagesize + 1)),$(($page * $pagesize + $pagesize))p" \
+    | sed -n "$page,$(($page + $pagesize - 1))p" \
     | tee "$cache"
   fi \
   | while read line; do