diff --git a/plugin/Live/view/onlineLabel.php b/plugin/Live/view/onlineLabel.php index b1e7c2c5b..12da9c18b 100644 --- a/plugin/Live/view/onlineLabel.php +++ b/plugin/Live/view/onlineLabel.php @@ -1,187 +1,186 @@ doNotShowOnlineOfflineLabel){ $liveViewStatusClass .= ' hidden'; } - if (isLiveLink() || Live::isLiveAndIsReadyFromKey($streamName, $live_servers_id, @$live['live_index'])) { echo "ONLINE"; } else { echo "OFFLINE"; } ?> \ No newline at end of file diff --git a/plugin/Live/webcamFullscreen.php b/plugin/Live/webcamFullscreen.php index b14ece227..4fb61dee7 100644 --- a/plugin/Live/webcamFullscreen.php +++ b/plugin/Live/webcamFullscreen.php @@ -1,163 +1,167 @@ webRTC_player; $iframeURL = addQueryStringParameter($iframeURL, 'webSiteRootURL', $global['webSiteRootURL']); $iframeURL = addQueryStringParameter($iframeURL, 'userHash', Live::getUserHash(User::getId())); $chatURL = ''; $chat = AVideoPlugin::loadPluginIfEnabled('Chat2'); if (!empty($chat)) { $chatURL = Chat2::getChatRoomLink(User::getId(), 1, 1, 1, true, 1); - if(!empty($_REQUEST['user'])){ + if (!empty($_REQUEST['user'])) { $chatURL = addQueryStringParameter($chatURL, 'user', $_REQUEST['user']); } - if(!empty($_REQUEST['pass'])){ + if (!empty($_REQUEST['pass'])) { $chatURL = addQueryStringParameter($chatURL, 'pass', $_REQUEST['pass']); } } +$users_id = User::getId(); +$trasnmition = LiveTransmition::createTransmitionIfNeed($users_id); +$live_servers_id = Live::getCurrentLiveServersId(); +$liveStreamObject = new LiveStreamObject($trasnmition['key'], $live_servers_id, @$_REQUEST['live_index'], 0); +$streamName = $liveStreamObject->getKeyWithIndex(true); ?> <?php echo $config->getWebSiteTitle(); ?> - + - + id="chat2Iframe" + src="" + > +
-