From b43ca639a3c1783bee00d16aa27a22e3c06e3737 Mon Sep 17 00:00:00 2001
From: Cebabonet <cebabonet@openmailbox.org>
Date: Wed, 22 Mar 2017 19:46:32 +0100
Subject: [PATCH] Fixing YouTube, Vimeo and Dailymotion video integration

---
 classes/sorbet.class.php | 6 +++---
 classes/util.class.php   | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/classes/sorbet.class.php b/classes/sorbet.class.php
index 761959e..005df52 100755
--- a/classes/sorbet.class.php
+++ b/classes/sorbet.class.php
@@ -176,13 +176,13 @@ class sorbet
         $util_class = new util();
         if ($util_class->isYoutubeVideo($url)) {
             $id_video = $util_class->getYoutubeVideoUrl($url);
-            return "\t\t\t<object type=\"application/x-shockwave-flash\" style=\"width:500px;height:393px\" data=\"http://www.youtube.com/v/".$id_video."\"><param name=\"movie\" value=\"http://www.youtube.com/v/".$id_video."\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
+            return "\t\t\t<iframe width=\"640\" height=\"360\" src=\"https://www.youtube.com/embed/".$id_video."\" frameborder=\"0\" allowfullscreen></iframe>\n";
         } elseif ($util_class->isVimeoVideo($url)) {
             $id_video = $util_class->getVimeoVideoUrl($url);
-            return "\t\t\t<object type=\"application/x-shockwave-flash\" style=\"width:500px;height:393px\" data=\"http://www.vimeo.com/moogaloop.swf?clip_id=".$id_video."\"><param name=\"movie\" value=\"http://www.vimeo.com/moogaloop.swf?clip_id=".$id_video."\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
+            return "\t\t\t<iframe src=\"https://player.vimeo.com/video/".$id_video."\" width=\"640\" height=\"360\" frameborder=\"0\" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>\n";
         } elseif ($util_class->isDailymotionVideo($url)) {
             $id_video = $util_class->getDailymotionVideoUrl($url);
-            return "\t\t\t<object type=\"application/x-shockwave-flash\" style=\"width:500px;height:393px\" data=\"http://www.dailymotion.com/swf/".$id_video."\"><param name=\"movie\" value=\"http://www.dailymotion.com/swf/".$id_video."\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
+            return "\t\t\t<iframe frameborder=\"0\" width=\"640\" height=\"360\" src=\"//www.dailymotion.com/embed/video/".$id_video."\" allowfullscreen></iframe><br />\n";
         } elseif ($util_class->isYahooVideo($url)) {
             $id_video = $util_class->getYahooVideoCode($url);
             return "\t\t\t<object type=\"application/x-shockwave-flash\" style=\"width:500px;height:393px\" data=\"http://d.yimg.com/static.video.yahoo.com/yep/YV_YEP.swf\"><param name=\"quality\" value=\"high\" /><param name=\"FlashVars\" value=\"event_function=YAHOO.yv.Player.SWFInterface&amp;id=".$id_video[1]."&amp;vid=".$id_video[0]."&amp;onsite=1&amp;site=video.yahoo.com&amp;page=792730258&amp;lang=en-US&amp;intl=us\" /><param name=\"wmode\" value=\"transparent\" /></object>\n";
diff --git a/classes/util.class.php b/classes/util.class.php
index c19d118..f8279d3 100755
--- a/classes/util.class.php
+++ b/classes/util.class.php
@@ -150,7 +150,7 @@ class util
     public function isVimeoVideo($videoUrl)
     {
         $util_class = new util();
-        if ($util_class->beginsWith($videoUrl, "http://vimeo.com/") || $util_class->beginsWith($videoUrl, "http://www.vimeo.com/")) {
+        if ($util_class->beginsWith($videoUrl, "http://vimeo.com/") || $util_class->beginsWith($videoUrl, "http://www.vimeo.com/") || $util_class->beginsWith($videoUrl, "https://vimeo.com/")) {
             return true;
         } else {
             return false;
@@ -162,7 +162,8 @@ class util
         if (substr_count($videoUrl, "clip:")==1) {
             return array_pop(explode("clip:", $videoUrl));
         } else {
-            return array_pop(explode("/", $videoUrl));
+            $videoUrl = explode("/", $videoUrl);
+            return array_pop($videoUrl);
         }
     }