From f637cbf2d857fd30c80df7b2541e860fe4151775 Mon Sep 17 00:00:00 2001 From: paul Date: Mon, 22 Sep 2014 00:32:46 +0000 Subject: [PATCH] enable video filenames containing ampersand svn path=/trunk/; revision=14 --- actions/watch.sh | 2 +- pages/videoview.sh | 5 +++-- templates/videoview.css.sh | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/actions/watch.sh b/actions/watch.sh index cd1dd14..65bfecd 100755 --- a/actions/watch.sh +++ b/actions/watch.sh @@ -8,7 +8,7 @@ filter="$_REF[\"f\"]" page="$_REF[\"p\"]" watch_link='' -[ -n "$info" ] && watch_link="${watch_link}i=${info}&" +[ -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}&" diff --git a/pages/videoview.sh b/pages/videoview.sh index ac3532b..6f418f0 100755 --- a/pages/videoview.sh +++ b/pages/videoview.sh @@ -25,7 +25,7 @@ page=$(echo "$_GET[\"p\"]" |egrep '^[0-9]+$') [ -z "$page" ] && page=0 page_link='' -[ -n "$info" ] && page_link="${page_link}i=${info}&" +[ -n "$info" ] && page_link="i=$(echo -n "$info" |sed -r 's:%:%25:g;s:\&:%26:g;')&" [ -n "$order" ] && page_link="${page_link}o=${order}&" [ -n "$search" ] && page_link="${page_link}s=${search}&" [ -n "$filter" ] && page_link="${page_link}f=${filter}&" @@ -98,9 +98,10 @@ _printVideo(){ minutes="$(($length / 60)):0$(($length % 60))" ||\ minutes="$(($length / 60)):$(($length % 60))" + linkinfo="$(echo -n "$info" |sed -r 's:%:%25:g;s:\&:%26:g;')" tee "$cache" < - + $info diff --git a/templates/videoview.css.sh b/templates/videoview.css.sh index b238998..08d5a81 100755 --- a/templates/videoview.css.sh +++ b/templates/videoview.css.sh @@ -94,6 +94,10 @@ a.clearsearch, a.advanced, a.tagger, .pagination_nav { display: block } +#thumblist { + padding: .5em 0 3em 0; +} + #thumblist .thumb { display: inline-block; width: 212px; -- 2.39.2