No commit message

dodiitt · Mar 6, 2019 · 0e135e1 · 0e135e1
1 parent 95ba000
commit 0e135e1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/objects/playlist.php b/objects/playlist.php
@@ -112,7 +112,7 @@ static function getAllFromUserVideo($userId, $videos_id, $publicOnly = true, $st
 
     static function getVideosFromPlaylist($playlists_id) {
         global $global;
-        $sql = "SELECT *,v.created as cre, p.`order` as video_order FROM  playlists_has_videos p "
+        $sql = "SELECT *,v.created as cre, p.`order` as video_order, v.externalOptions as externalOptions FROM  playlists_has_videos p "
                 . " LEFT JOIN videos as v ON videos_id = v.id "
                 . " LEFT JOIN users u ON u.id = v.users_id "
                 . " WHERE playlists_id = ? ORDER BY p.`order` ASC ";

diff --git a/plugin/PlayLists/PlayListElement.php b/plugin/PlayLists/PlayListElement.php
@@ -2,15 +2,16 @@
 
 class PlayListElement {
 
-    public $name, $description, $duration, $sources, $thumbnail, $poster;
+    public $name, $description, $duration, $sources, $thumbnail, $poster, $videoStartSeconds;
 
-    function __construct($name, $description, $duration, $playListSource, $playListThumbnail, $poster) {
+    function __construct($name, $description, $duration, $playListSource, $playListThumbnail, $poster, $videoStartSeconds) {
         $this->name = $name;
         $this->description = $description;
         $this->setDuration($duration);
         $this->sources = $playListSource;
         $this->thumbnail = $playListThumbnail;
         $this->poster = $poster;
+        $this->videoStartSeconds = $videoStartSeconds;
     }
 
 
@@ -56,6 +57,8 @@ function setPlayListSource($playListSource) {
     function setPlayListThumbnail($playListThumbnail) {
         $this->thumbnail = $playListThumbnail;
     }
+
+
 
 }
 

diff --git a/plugin/YouPHPFlix2/view/css/fullscreen.css b/plugin/YouPHPFlix2/view/css/fullscreen.css
@@ -15,6 +15,11 @@ body{
     justify-content: center;
     padding-bottom: 120px;
 }
+
+#youtubeModeOnFullscreenCloseButton{
+    display: block !important;
+}
+
 .firstC{
     position: absolute;
 }
diff --git a/view/include/video.php b/view/include/video.php
@@ -58,6 +58,10 @@
                 <?php } ?>
 
             </div>
+
+            <a href="<?php echo $_SERVER["HTTP_REFERER"]; ?>" class="btn btn-outline btn-xs" style="position: absolute; top: 5px; right: 5px; display: none;" id="youtubeModeOnFullscreenCloseButton">
+                <i class="fas fa-times"></i>
+            </a>
         </div>
     </div>
     <div class="col-sm-2 col-md-2"></div>