rename p attribute to pn, and use p for cgi page name instead

[serve0] / pages / common.sh

diff --git a/pages/common.sh b/pages/common.sh
index 5e233142f7d289ffb354fbe3d868f7c70cce5081..6d12ded896baf717e3a1f18ef89c828731adbd05 100755 (executable)
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -20,7 +20,7 @@
 filter="$_GET[\"f\"]"
 search="$_GET[\"s\"]"
 order=$(echo -E "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
-page=$(echo -E "$_GET[\"p\"]" |egrep '^[0-9]+$')
+page=$(echo -E "$_GET[\"pn\"]" |egrep '^[0-9]+$')
 [ -z "$page" ] && page=0
 
 page_link=''
@@ -28,9 +28,9 @@ page_link=''
 [ -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}p=$([ "$page" = 0 ] && echo 0 || echo $(($page - 1)) )"
-page_next="${page_link}p=$(($page + 1))"
-page_this="${page_link}p=$page"
+page_prev="${page_link}pn=$([ "$page" = 0 ] && echo 0 || echo $(($page - 1)) )"
+page_next="${page_link}pn=$(($page + 1))"
+page_this="${page_link}pn=$page"
 
 taglist=$(
   [ -r ${_DATA}/cache/taglist ] && cat ${_DATA}/cache/taglist ||\
@@ -102,7 +102,7 @@ _by_date(){ ls -c ${_DATA}/videos/ |egrep -i "$file_pattern" }
 _by_length(){ find ${_DATA}/by_length/ -mindepth 1 -maxdepth 1 -printf '%f\n' |sort |sed -r 's:[0-9]{5} - ::' }
 
 thumblist() {
-  cache="${_DATA}/cache/?o=${order}&s=${search}&f=${filter}&p=${page}"
+  cache="${_DATA}/cache/?o=${order}&s=${search}&f=${filter}&pn=${page}"
   if [ "$cache" -nt ${_DATA}/videos -a "$cache" -nt ${_DATA}/meta ]; then
     cat "$cache"
   else