enable video filenames containing ampersand

[serve0] / pages / videoview.sh

diff --git a/pages/videoview.sh b/pages/videoview.sh
index ac3532b4f6349b717b0df290c27a5156d93a114d..6f418f05f7d9086d6990abcf06762cdeea8cde93 100755 (executable)
--- 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" <<VIDEOend
       <div class="thumb">
-        <a class="watchlink" name="$info" href="?action=watch&i=$info">
+        <a class="watchlink" name="$linkinfo" href="?action=watch&i=$linkinfo">
           <img src="$thumb">
         </a>
         <a class="videolink" href="$video">$info</a>