yetangitu/Oinktube
1
0
Fork 0
mirror of https://github.com/DanielnetoDotCom/YouPHPTube synced 2025-10-03 09:49:28 +02:00
Code Issues Releases Wiki Activity

Update

Browse source
This commit is contained in:
Daniel Neto 2024-11-26 13:59:11 -03:00
parent e162f064b0
commit e66c25145f
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugin/CDN/CDN.php
View file

@ -103,8 +103,9 @@ class CDN extends PluginAbstract
$obj = $this->getDataObject(); $obj = $this->getDataObject();
$url = "https://youphp.tube/marketplace/CDN/iframe.php?hash={hash}"; $url = "https://youphp.tube/marketplace/CDN/iframe.php?hash={hash}";
if (empty($global['disableAdvancedConfigurations'])) {
$url = addQueryStringParameter($url, 'hash', $obj->key); $url = addQueryStringParameter($url, 'hash', $obj->key);
}
$url = addQueryStringParameter($url, 'webSiteRootURL', $global['webSiteRootURL']); $url = addQueryStringParameter($url, 'webSiteRootURL', $global['webSiteRootURL']);
$cdnMenu = str_replace('{url}', $url, $content); $cdnMenu = str_replace('{url}', $url, $content);

16
plugin/Live/latestOrLive.php
View file

@ -51,10 +51,14 @@ function matchWithRequest($row)
} }
$liveFound = false; $liveFound = false;
$isEnabledPayPerViewLive = AVideoPlugin::isEnabledByName("PayPerViewLive");
if (AVideoPlugin::isEnabledByName('PlayLists')) { if (AVideoPlugin::isEnabledByName('PlayLists')) {
// try to get a live that is not a scheduled playlist // try to get a live that is not a scheduled playlist
$lives = LiveTransmitionHistory::getActiveLives('', false); $lives = LiveTransmitionHistory::getActiveLives('', false);
foreach ($lives as $key => $value) { foreach ($lives as $key => $value) {
if ($isEnabledPayPerViewLive && !PayPerViewLive::canUserWatchNow(User::getId(), $value['users_id'])) {
continue;
}
if (!Playlists_schedules::iskeyPlayListScheduled($value['key'])) { if (!Playlists_schedules::iskeyPlayListScheduled($value['key'])) {
if (matchWithRequest($value)) { if (matchWithRequest($value)) {
$liveVideo = $value; $liveVideo = $value;
@ -65,8 +69,18 @@ if (AVideoPlugin::isEnabledByName('PlayLists')) {
} }
} }
if (!$liveFound) { if (!$liveFound) {
$liveVideo = Live::getLatest(true, $users_id, $categories_id); //$liveVideo = Live::getLatest(true, $users_id, $categories_id);
$activeLives = LiveTransmitionHistory::getActiveLives();
foreach ($activeLives as $key => $value) {
if ($isEnabledPayPerViewLive && !PayPerViewLive::canUserWatchNow(User::getId(), $value['users_id'])) {
continue;
}
$liveVideo = $value;
break;
}
} }
//var_dump($liveFound, $liveVideo);exit;
if (!empty($liveVideo)) { if (!empty($liveVideo)) {
setLiveKey($liveVideo['key'], $liveVideo['live_servers_id'], $liveVideo['live_index']); setLiveKey($liveVideo['key'], $liveVideo['live_servers_id'], $liveVideo['live_index']);
$poster = getURL(Live::getPosterImage($liveVideo['users_id'], $liveVideo['live_servers_id'])); $poster = getURL(Live::getPosterImage($liveVideo['users_id'], $liveVideo['live_servers_id']));