X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Fcommon.sh;h=6257aad6e3fba469e17f8143c2cd05dcae9ab5fb;hb=b6d914a4ee1b64a318b17207b92d791af5c8d658;hp=9926badff68669956584c94c11ddc298cd86f684;hpb=37450b7423b778817c24521e60c6719335d62d26;p=serve0

diff --git a/pages/common.sh b/pages/common.sh
index 9926bad..6257aad 100755
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -24,7 +24,7 @@ page="${_GET[pn]}" #validated
 pagesize="${_COOKIE[pagesize]}" #validated
 
 page_link=''
-[ -n "$info" ]   && page_link="i=$(urlsave "$info")&"
+[ -n "$info" ]   && page_link="i=$(urlsafe "$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}&"
@@ -49,8 +49,8 @@ _printVideo(){
   else
     videofile="${_DATA}/videos/$info"
     thumb="${_DATA}/thumbs/$info.jpg"
-    [ -r "$meta"  ] || ${_EXEC}/helpers/genmeta.sh "$videofile" "$meta"
-    [ -r "$thumb" ] || ${_EXEC}/helpers/genthumb.sh "$videofile" "$thumb"
+    [ -r "$meta"  ] || ${_EXEC}/helpers/genmeta.sh "$videofile" "$meta" >/dev/null
+    [ -r "$thumb" ] || ${_EXEC}/helpers/genthumb.sh "$videofile" "$thumb" >/dev/null
 
     head -n1 "$meta" |read length width height filename
     [ -z "$length" ] && length=0
@@ -58,9 +58,10 @@ _printVideo(){
     [ -z "$height" ] && height=0
 
     tags="$(sed -n 2p "$meta")"
-    video="$(urlsave "videos/$info")"
-    thumb="$(urlsave "thumbs/$info.jpg")"
-    linkinfo="$(urlsave "$info")"
+    video="$(urlsafe "videos/$info")"
+    thumb="$(urlsafe "thumbs/$info.jpg")"
+    linkinfo="$(urlsafe "$info")"
+    htmlinfo="$(htmlsafe "$info")"
 
     [ "$(($length % 60))" -lt 10 ] && minutes="$(($length / 60)):0$(($length % 60))" \
                                    || minutes="$(($length / 60)):$(($length % 60))"
@@ -70,9 +71,9 @@ _printVideo(){
         <a class="watchlink" name="${linkinfo}" href="?action=watch&i=${linkinfo}">
           <img src="$thumb" alt="Preview not yet available">
         </a>
-        <h2>$info</h2>
+        <h2>${htmlinfo}</h2>
         
-        <input type="checkbox" name="tagsel" value="$info">
+        <input type="checkbox" name="tagsel" value="${htmlinfo}">
         <span class="info property">${minutes}min</span>
         <span class="info property">${width}x${height}</span>
 	$(printf %s "$tags" |sed -r 's:\|*([^|]+)\|*: <span class="info tag">\1</span>:g')