diff --git a/objects/functionsGetTinyMCE.php b/objects/functionsGetTinyMCE.php index c0a829e14..f61ad7990 100644 --- a/objects/functionsGetTinyMCE.php +++ b/objects/functionsGetTinyMCE.php @@ -1,58 +1,58 @@ disableHTMLDescription)) { global $tinyMCELibs; if(empty($tinyMCELibs)){ $tinyMCELibs = 1; ?> <?php echo $siteTitle; ?> diff --git a/plugin/Live/webRTC.js b/plugin/Live/webRTC.js index 7951ac4a3..08b667dca 100644 --- a/plugin/Live/webRTC.js +++ b/plugin/Live/webRTC.js @@ -1,42 +1,54 @@ window.addEventListener('message', event => { if (event.data.startLiveRestream) { startLiveRestream(event.data.m3u8); + }else + if (event.data.webRTCModalConfig) { + console.log('event.data.webRTCModalConfig', event.data.webRTCModalConfig, typeof webRTCModalConfigShow); + if(event.data.webRTCModalConfig==1){ + if(typeof webRTCModalConfigShow =='function'){ + webRTCModalConfigShow(); + } + }else{ + if(typeof webRTCModalConfigHide =='function'){ + webRTCModalConfigHide(); + } + } } }); function startLiveRestream(m3u8) { //console.log('WebRTCLiveCam: startLive'); modal.showPleaseWait(); $.ajax({ url: webSiteRootURL + '/plugin/Live/webRTCToLive.json.php', method: 'POST', data: { 'm3u8': m3u8, 'live_servers_id': '' }, success: function (response) { if (response.error) { webRTCDisconnect(); avideoAlertError(response.msg); } else { avideoToastSuccess(response.msg); //document.querySelector("iframe").contentWindow.postMessage({setLiveStart: 1}, "*"); } modal.hidePleaseWait(); } }); } function webRTCConnect() { modal.showPleaseWait(); document.querySelector("iframe").contentWindow.postMessage({setLiveStart: 1}, "*"); } function webRTCDisconnect() { document.querySelector("iframe").contentWindow.postMessage({setLiveStop: 1}, "*"); } function webRTCConfiguration() { document.querySelector("iframe").contentWindow.postMessage({setConfiguration: 1}, "*"); } \ No newline at end of file diff --git a/plugin/Live/webcamFullscreen.php b/plugin/Live/webcamFullscreen.php index f5b9654b3..68d82413b 100644 --- a/plugin/Live/webcamFullscreen.php +++ b/plugin/Live/webcamFullscreen.php @@ -1,95 +1,162 @@ webRTC_player; $iframeURL = addQueryStringParameter($iframeURL, 'webSiteRootURL', $global['webSiteRootURL']); $iframeURL = addQueryStringParameter($iframeURL, 'userHash', Live::getUserHash(User::getId())); $chatURL = ''; $chat = AVideoPlugin::loadPluginIfEnabled('Chat2'); -if(!empty($chat)){ - Chat2::getChatRoomLink(User::getId(), 1, 1, 1, true); +if (!empty($chat)) { + $chatURL = Chat2::getChatRoomLink(User::getId(), 1, 1, 1, true, 1); + if(!empty($_REQUEST['user'])){ + $chatURL = addQueryStringParameter($chatURL, 'user', $_REQUEST['user']); + } + if(!empty($_REQUEST['pass'])){ + $chatURL = addQueryStringParameter($chatURL, 'pass', $_REQUEST['pass']); + } } - ?> <?php echo $config->getWebSiteTitle(); ?> - - - + + + +
- +
+ + +
+ +
+
+ + diff --git a/plugin/MobileManager/MobileManager.php b/plugin/MobileManager/MobileManager.php index 2e5374034..02df09ff9 100644 --- a/plugin/MobileManager/MobileManager.php +++ b/plugin/MobileManager/MobileManager.php @@ -1,98 +1,98 @@ isReadyLabel(array('API')); return $desc; } public function getName() { return "MobileManager"; } public function getUUID() { return "4c1f4f76-b336-4ddc-a4de-184efe715c09"; } public function getPluginVersion() { return "1.5"; } public function getEmptyDataObject() { global $global; $obj = new stdClass(); //$obj->aboutPage = ""; //$obj->disableGif = false; $obj->doNotAllowAnonimusAccess = false; $obj->doNotAllowUpload = false; $obj->hideCreateAccount = false; $obj->hideTabTrending = false; $obj->hideTabLive = false; $obj->hideTabSubscription = false; $obj->hideTabChat2 = false; $obj->hideTabPlayLists = false; $obj->hideViewsCounter = false; $obj->hideLikes = false; $o = new stdClass(); $o->type = "textarea"; $o->value = "This Software must be used for Good, never Evil. There is no tolerance for objectionable content or abusive users. It is expressly forbidden to use this app to build porn sites, violence, racism or anything else that affects human integrity or denigrates the image of anyone.\n" . "Any complaints, or through the application or any other electronic means will be analyzed and in case of any criteria established by the developer or local laws, are disrespected, we reserve the right to block and ban any site from our systems\n" . "The banned site will be prohibited from using any of our resources, including mobile applications, encoder, plugins, etc."; $obj->EULA = $o; $obj->themeDark = false; $obj->portraitImage = false; $obj->netflixStyle = false; //$obj->netflixPlayList = true; //$obj->netflixPlayListAutoPlay = true; $obj->netflixDateAdded = true; //$obj->netflixDateAddedAutoPlay = true; $obj->netflixMostPopular = true; //$obj->netflixMostPopularAutoPlay = true; $obj->netflixMostWatched = true; //$obj->netflixMostWatchedAutoPlay = true; $obj->netflixCategories = true; //$obj->netflixCategoriesAutoPlay = true; //$obj->netflixSortByName = false; $obj->netflixBigVideo = true; $obj->disableWhitelabel = false; $obj->disableComments = false; $obj->approvalMode = false; $obj->showMeet = true; - $obj->goLiveWithMeet = true; + $obj->goLiveWithMeet = false; $obj->doNotAutoSearch = false; $obj->playStoreApp = 'https://play.google.com/store/apps/details?id=mobile.youphptube.com'; $obj->appleStoreApp = 'https://apps.apple.com/us/app/youphptube/id1337322357'; $obj->pwa_background_color = "#000000"; $o = new stdClass(); $o->type = array('fullscreen', 'standalone', 'minimal-ui'); $o->value = "standalone"; $obj->pwa_display = $o; $obj->pwa_scope = "/"; return $obj; } public function upload(){ } } diff --git a/view/trending.php b/view/trending.php index 78ff675a2..7c8745ae3 100644 --- a/view/trending.php +++ b/view/trending.php @@ -1,239 +1,244 @@ <?php echo __("Trending") . getSEOComplement() . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?>
-
-

-

+

+