Update restream

.gitignore

@@ -81,3 +81,4 @@ objects/ezyang/
 /plugin/VideoOffline/
 /plugin/TestOnly/
 view/videoComments_bkp.php
+/.compose/

Dockerfile

@@ -9,7 +9,6 @@ LABEL maintainer="TRW <trw@acoby.de>" \
       org.label-schema.vendor="WWBN"
 
 ARG DEBIAN_FRONTEND=noninteractive
-ARG VERSION_ENCODER=3.7
 
 ENV DB_MYSQL_HOST database
 ENV DB_MYSQL_PORT 3306
@@ -76,7 +75,7 @@ RUN chmod 755 /usr/local/bin/docker-entrypoint && \
     pip3 install youtube-dl && \
     cd /var/www/html/AVideo && \
     git config --global advice.detachedHead false && \
-    git clone -b $VERSION_ENCODER --depth 1 https://github.com/WWBN/AVideo-Encoder.git Encoder && \
+    git clone https://github.com/WWBN/AVideo-Encoder.git Encoder && \
     chown -R www-data:www-data /var/www/html/AVideo && \
     cd /var/www/html/AVideo/plugin/User_Location/install && \
     unzip install.zip && \

plugin/Cache/Cache.php

@@ -149,7 +149,9 @@ class Cache extends PluginAbstract
             if ($isBot && $lifetime < 3600) {
                 $lifetime = 3600;
             }
+            if(empty($_REQUEST['debug_cache'])){
                 $firstPageCache = ObjectYPT::getCache($cacheName, $lifetime, true);
+            }
             if (!empty($firstPageCache) && strtolower($firstPageCache) != 'false') {
                 if ($isBot && $_SERVER['REQUEST_URI'] !== '/login') {
                     //_error_log("Bot Detected, showing the cache ({$_SERVER['REQUEST_URI']}) FROM: {$_SERVER['REMOTE_ADDR']} Browser: {$_SERVER['HTTP_USER_AGENT']}");

plugin/Layout/Layout.php

@@ -516,9 +516,13 @@ class Layout extends PluginAbstract {
     static function organizeHTML($html) {
         global $global; // add socket twice on live page
         //return $html;
-        if (!empty($global['doNOTOrganizeHTML']) || !empty($_REQUEST['debug'])) {
+        if (!empty($global['doNOTOrganizeHTML'])) {
             //var_dump('doNOTOrganizeHTML');exit;
-            return $html;
+            return $html.PHP_EOL.'<!-- Layout::organizeHTML doNOTOrganizeHTML -->';
+        }
+        if (!empty($_REQUEST['debug'])) {
+            //var_dump('doNOTOrganizeHTML');exit;
+            return $html.PHP_EOL.'<!-- Layout::organizeHTML debug -->';
         }
         self::$tags = array();
         //return $html;
@@ -685,10 +689,6 @@ class Layout extends PluginAbstract {
 
     public function getEnd() {
         global $global;
-        if(!empty($global['layoutend'])){
-            return false;
-        }
-        $global['layoutend'] = 1;
         $html = _ob_get_clean();
         $html = self::organizeHTML($html);
         //_ob_clean();

plugin/Live/Objects/Live_restreams.php

@@ -103,7 +103,12 @@ class Live_restreams extends ObjectYPT {
                 $row['restreamsToken'] = encryptString($row['id']);
                 $row['display_name'] = getWordOrIcon($row['name'], 'fa-2x');
                 $row['token_expired'] = self::checkIfTokenIsExpired($row['parameters']);
-                $row['valid'] = $row['token_expired']->needToRevalidate?'<i class="fas fa-times"></i>':'<i class="fas fa-check"></i>';
+                $row['provider'] = self::getProviderName($row['parameters']);
+                if ($row['token_expired']->needToRevalidate) {
+                    $row['revalidateButton'] = '<button class="btn btn-primary btn-xs" onclick="openRestream(\''.$row['provider'].'\');"><i class="fas fa-sync"></i> '.__("Revalidate").'</button>';
+                } else {
+                    $row['revalidateButton'] = '<i class="fas fa-check text-success"></i>';
+                }
                 $rows[] = $row;
             }
         } else {
@@ -112,6 +117,22 @@ class Live_restreams extends ObjectYPT {
         return $rows;
     }
 
+    private static function getProviderName($parameters) {
+        if (is_string($parameters)) {
+            $parameters = object_to_array(json_decode($parameters));
+        }
+
+        if (!empty($parameters['restream.ypt.me'])) {
+            foreach ($parameters['restream.ypt.me'] as $key => $value) {
+                if (preg_match('/(youtube|facebook|twitch)/i', $key)) {
+                    return $key;
+                }
+            }
+        }
+
+        return false;
+    }
+
     private static function checkIfTokenIsExpired($parameters) {
         if (is_string($parameters)) {
             $parameters = object_to_array(json_decode($parameters));
@@ -140,6 +161,7 @@ class Live_restreams extends ObjectYPT {
             }
         }
         $obj->isExpired = true;
+
         return $obj;
     }
 

plugin/Live/view/Live_restreams/livePanelForm.php

@@ -75,10 +75,10 @@ if (!Live::canRestream()) {
 </div>
 <div id="Live_restreamsbtnModelLinks" style="display: none;">
     <div class="btn-group pull-right">
-        <button href="" class="edit_Live_restreams btn btn-default btn-xs">
+        <button class="edit_Live_restreams btn btn-default btn-xs">
             <i class="fa fa-edit"></i>
         </button>
-        <button href="" class="delete_Live_restreams btn btn-danger btn-xs">
+        <button class="delete_Live_restreams btn btn-danger btn-xs">
             <i class="fa fa-trash"></i>
         </button>
     </div>
@@ -125,7 +125,7 @@ if (!Live::canRestream()) {
                 },
                 {"data": "status"},
                 {"data": "stream_key_short"},
-                {"data": "valid"},
+                {"data": "revalidateButton"},
                 {
                     sortable: false,
                     data: null,

plugin/Meet/getMeetInfo.json.php

@@ -35,7 +35,7 @@ if (!$ms->canManageSchedule()) {
 
 $obj->error = false;
 
-ob_end_clean();
+_ob_end_clean();
 _ob_start();
 
 

plugin/PlayerSkins/epg.php

@@ -13,7 +13,7 @@ $default_socket_timeout = 4;
 $cacheTimeout = 60;
 $forceRecreate = false;
 if (isCommandLineInterface()) {
-    ob_end_clean();
+    _ob_end_clean();
     _error_log('Commandline: Command line EPG');
     $forceRecreate = true;
     $default_socket_timeout = 10;

view/about.php

@@ -77,3 +77,6 @@ $metaDescription = "About Page";
         </script>
     </body>
 </html>
+<?php
+include $global['systemRootPath'].'objects/include_end.php';
+?>

view/help.php

@@ -112,3 +112,6 @@ require_once $global['systemRootPath'] . 'plugin/AVideoPlugin.php';
         </script>
     </body>
 </html>
+<?php
+include $global['systemRootPath'].'objects/include_end.php';
+?>