use HTT_HOST in coop redirect

[serve0] / actions / watch.sh

diff --git a/actions/watch.sh b/actions/watch.sh
index cc47088c0bebc5e73c1b13895a307db1dd51e896..cfa543723f289e1d1f6fe0a1ef29c36a0e10fbe8 100755 (executable)
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -2,8 +2,8 @@
 
 cgi_refdata
 info="${_GET[i]}"
-watch="${_GET[w]:-${_COOKIE[watch]}}"
 location="$(invalidate "${_GET[l]}" '(.*/)?\.\.(/.*)?|' /)"
+foreign="$(validate "${_GET[url]}" 'https?://.*' '')"
 order="${_POST[o]}"
 search="${_POST[s]}"
 filter="${_POST[f]}"
@@ -28,16 +28,19 @@ linkinfo="$(urlsafe "$info")"
 if [ "${_COOKIE[fakemp4]}" = yes ] && [ "${info##*.}" != mp4 ]; then
   [ -e "${_DATA}/videos/${info%.*}.mp4" ] || ln -s "${_DATA}/videos/$info" "${_DATA}/mp4/${info%.*}.mp4"
   videourl="$(urlsafe "mp4/${info%.*}.mp4")"
+elif [ -n "$foreign" ]; then
+  _COOKIE[watch]=server
+  videourl="${_GET[url]}"
 elif [ -z "$info" ]; then
   videourl="$(urlsafe "${location#/}")"
 else
   videourl="$(urlsafe "videos/$info")"
 fi
 
-case "$watch" in
+case "$_COOKIE[watch]" in
   raspi)
-    rpiaddr="http://atoemchen.helmchyn.no-ip.biz/?action=watch&w=server&i="
-    redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/${videourl}")"
+    rpiaddr="http://atoemchen.helmchyn.no-ip.biz/?action=watch&url="
+    redirect "${rpiaddr}$(urlsafe "http://${HTTP_HOST}/${videourl}")"
   ;;
   480p)
     [ $height -gt 480 ] && redirect "?action=transcode&i=${linkinfo}&t=480" \
@@ -53,6 +56,7 @@ case "$watch" in
   server)
     [ -n "$location" ] && playuri="${treeroot%/}/${location#/}"
     [ -n "$info" ]     && playuri="${_DATA}/videos/$info"
+    [ -n "$foreign" ]  && playuri="$videourl"
 
     metafile="${_DATA}/meta/${info}.meta"