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

svn path=/trunk/; revision=54

diff --git a/actions/meta.sh b/actions/meta.sh
index 25799b88a4bde1826c63ce2f0e908ece05231237..10b188fef0bdab35f217fe5e299fd7a7f635429e 100755 (executable)
--- a/actions/meta.sh
+++ b/actions/meta.sh
@@ -4,7 +4,7 @@ info="$_GET[\"i\"]"
 order="$_GET[\"o\"]"
 search="$_GET[\"s\"]"
 filter="$_GET[\"f\"]"
-page="$_GET[\"p\"]"
+page="$_GET[\"pn\"]"
 file="${_DATA}/meta/$info.meta"
 
 cgi_post
@@ -40,4 +40,4 @@ else
   rm ${_DATA}/cache/taglist 2>/dev/null
 fi
 
-echo -n "Location: ?i=&p=${page}&s=${search}&f=${filter}&o=${order}#$info\n\n"
+echo -n "Location: ?i=&pn=${page}&s=${search}&f=${filter}&o=${order}#$info\n\n"

diff --git a/actions/multitag.sh b/actions/multitag.sh
index 7c5b252601ce97566f165d5a295ef124aad1d9ab..ddd96c3f47a20666b165d749a6ee8e5efb1e6436 100755 (executable)
--- a/actions/multitag.sh
+++ b/actions/multitag.sh
@@ -3,7 +3,7 @@
 filter="$_GET[\"f\"]"
 search="$_GET[\"s\"]"
 order=$(echo "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
-page=$(echo "$_GET[\"p\"]" |egrep '^[0-9]+$')
+page=$(echo "$_GET[\"pn\"]" |egrep '^[0-9]+$')
 
 addtag(){
   meta="$1"
@@ -47,4 +47,4 @@ done
 rm "${_DATA}"/cache/\?* 2>/dev/null
 [ -n "$_POST[\"tags\"]" ] && rm "${_DATA}"/cache/taglist 2>/dev/null
 
-echo -n "Location: ?o=$order&s=$search&f=$filter&p=$page\n\n"
+echo -n "Location: ?o=$order&s=$search&f=$filter&pn=$page\n\n"

diff --git a/actions/watch.sh b/actions/watch.sh
index 8b0ee46bd96115cd6d51adf19a8abc3a89e3e77b..d64ae6716550b054f4888c8c05e95019fa43b1d9 100755 (executable)
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -5,13 +5,13 @@ info="$_GET[\"i\"]"
 order="$_REF[\"o\"]"
 search="$_REF[\"s\"]"
 filter="$_REF[\"f\"]"
-page="$_REF[\"p\"]"
+page="$_REF[\"pn\"]"
 
 watch_link=''
 [ -n "$info" ]   && watch_link="i=$(echo -n "${info}" |sed -r 's:%:%25:g;s:\&:%26:g;')&"
 [ -n "$order" ]  && watch_link="${watch_link}o=${order}&"
 [ -n "$search" ] && watch_link="${watch_link}s=${search}&"
 [ -n "$filter" ] && watch_link="${watch_link}f=${filter}&"
-[ -n "$page" ]   && watch_link="${watch_link}p=${page}"
+[ -n "$page" ]   && watch_link="${watch_link}pn=${page}"
 
 echo -n "Location: ?page=view&${watch_link}\n\n"

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

diff --git a/templates/filter.html.sh b/templates/filter.html.sh
index 70ee4b4169474683c75cb698168fd37c364d2379..9d7a6543d48ed2c1419b7f3724a425ba8af74b9f 100755 (executable)
--- a/templates/filter.html.sh
+++ b/templates/filter.html.sh
@@ -28,7 +28,7 @@ cat <<EOF
     <input disabled type="submit" name="submit" value="Find">
 
     <a class="panel clearsearch" href="?">Clear All</a>
-    <a class="panel advanced hide" href="?page=list">Hide</a>
+    <a class="panel advanced hide" href="?p=list">Hide</a>
     <hr>
 
     <p class="help">Up to <strong>10</strong> filter boxes will appear as you start selecting tags. You can select <strong>multiple</strong> tags in each box by holding down the <strong>Ctrl</strong>-key. Click the "<strong>Filter!</strong>" button when you are ready.</p>

diff --git a/templates/list.html.sh b/templates/list.html.sh
index 4f860ec136de2a955a1f6f895acd1145af8317b6..4f8dfa4ada6886d2aae746a9a78ea96e186a8f60 100755 (executable)
--- a/templates/list.html.sh
+++ b/templates/list.html.sh
@@ -29,7 +29,7 @@ cat <<EOF
     <input type="submit" name="submit" value="Find">
 
     <a class="panel clearsearch" href="?">Clear All</a>
-    <a class="panel advanced show" href="?page=filter">Advanced</a>
+    <a class="panel advanced show" href="?p=filter">Advanced</a>
 
     <div class="pagination_nav">
       <label>Page:</label>

diff --git a/templates/view.html.sh b/templates/view.html.sh
index 49439587ba27fe45a255f5e3657a913ac554f464..7092fa50e59c2e70d2855890b466d24a263d9f4f 100755 (executable)
--- a/templates/view.html.sh
+++ b/templates/view.html.sh
@@ -29,7 +29,7 @@ cat <<EOF
     <input type="submit" name="submit" value="Find">
 
     <a class="panel clearsearch" href="?">Clear All</a>
-    <a class="panel advanced show" href="?page=filter">Advanced</a>
+    <a class="panel advanced show" href="?p=filter">Advanced</a>
 
     <div class="pagination_nav">
       <label>Page:</label>
@@ -40,7 +40,7 @@ cat <<EOF
   </form>
 
   <div class="panel" id="videoview">
-    <a href="?page=list" class="panel">Dismiss</a>
+    <a href="?p=list" class="panel">Dismiss</a>
     <div class="video">
       <a href="$video">Full</a>
       <video controls>