bugfix: sequence of mode checks

[serve0] / actions / watch.sh

diff --git a/actions/watch.sh b/actions/watch.sh
index cc47088c0bebc5e73c1b13895a307db1dd51e896..5b4119f7612f6b51c32f367f9b4655e5d4531be2 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,15 +28,18 @@ 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="
+    rpiaddr="http://atoemchen.helmchyn.no-ip.biz/?action=watch&url="
     redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/${videourl}")"
   ;;
   480p)