yetangitu/Oinktube
1
0
Fork 0
mirror of https://github.com/DanielnetoDotCom/YouPHPTube synced 2025-10-04 10:19:24 +02:00
Code Issues Releases Wiki Activity

Some fine tunings

Browse source
This commit is contained in:
DanielnetoDotCom 2021-05-25 16:11:30 -03:00
parent 7d483344fa
commit d39ec71f0c
8 changed files with 27 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugin/Live/Live.php
View file

@ -484,13 +484,25 @@ class Live extends PluginAbstract {
return "";
}
$btn = "<div class=\"btn-group justified\">";
$btn = "<div class=\"btn-group justified recordLiveControlsDiv\" style=\"display: none;\" id=\"liveControls\">";
//$btn .= self::getButton("drop_publisher", $live_transmition_id, $live_servers_id);
$btn .= self::getButton("drop_publisher_reset_key", $key, $live_servers_id, $iconsOnly);
$btn .= self::getButton("record_start", $key, $live_servers_id, $iconsOnly);
$btn .= self::getButton("record_stop", $key, $live_servers_id, $iconsOnly);
$btn .= "</div>";
$btn .= "<script>
$(document).ready(function () {
setInterval(function () {
if (isOnlineLabel || $('.liveOnlineLabel.label-success').length) {
$('#liveControls').slideDown();
} else {
$('#liveControls').slideUp();
}
}, 1000);
});
</script>";
return $btn;
}
@ -2269,7 +2281,7 @@ class LiveStreamObject {
function getOnlineM3U8($users_id, $doNotProtect = false) {
$li = $this->live_index;
if(empty($this->live_index)){
if(empty($this->live_index)){
$online = Live::getFirstLiveOnlineFromKey($this->key);
if(!empty($online)){
$parameters = Live::getLiveParametersFromKey($online['key']);

24
plugin/Live/indexCol1.php
View file

@ -53,31 +53,11 @@
</video>
</div>
</div>
<div class="panel-footer" style="display: none;" id="liveControls">
<div class="panel-footer">
<?php
echo Live::getRecordControlls($liveStreamObject2->getKeyWithIndex(true, true));
echo Live::getAllControlls($liveStreamObject2->getKeyWithIndex(true, true));
?>
</div>
<script>
$(document).ready(function () {
setInterval(function () {
if (isOnlineLabel) {
$("#liveControls").slideDown();
if(player.paused()){
userIsControling = 0;
reloadVideoJS();
playerPlay();
}
} else {
$("#liveControls").slideUp();
if(!player.paused()){
player.pause();
}
}
}, 1000);
});
</script>
</div>
<?php
include $global['systemRootPath'] . 'plugin/Live/tabs/tabStreamSettings.php';

6
plugin/Live/on_publish.php
View file

@ -22,9 +22,9 @@ if(!empty($parts["query"])){
}
if(!empty($_GET['e']) && empty($_GET['p'])){
$obj = json_decode(decryptString($_GET['e']));
if(!empty($obj->users_id)){
$user = new User($obj->users_id);
$objE = json_decode(decryptString($_GET['e']));
if(!empty($objE->users_id)){
$user = new User($objE->users_id);
$_GET['p'] = $user->getPassword();
}
}

2
plugin/LiveLinks/view/videoListItem.html
View file

@ -1,6 +1,6 @@
<div class="col-lg-12 col-sm-12 col-xs-12 bottom-border videoListItem liveLink liveLink__unique_id_" id="videoListLiveLink__unique_id_" >
<div class="col-lg-5 col-sm-5 col-xs-5 nopadding thumbsImage videoLink h6">
<div style="position: relative;" class="galleryVideo">
<div style="position: relative;" class="galleryVideo liveVideo">
<a href="_link_" title="_title_">
_imgJPG_
_imgGIF_

3
view/css/custom/netflix.css
View file

@ -23,7 +23,8 @@
th a, .select2-container--default span, .swal-text,
.nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover,
.tabbable-line > .nav-tabs > li.active > a > i {
.tabbable-line > .nav-tabs > li.active > a > i,
.swal-title {
color: #FFF !important;
}
th:hover, .select2-dropdown{

6
view/import.php
View file

@ -41,17 +41,17 @@ if (!User::canUpload() || !empty($advancedCustom->doNotShowImportMP4Button)) {
<div class="input-group">
<input type="text" id="path" class="form-control" placeholder="Local Path of videos i.e. /media/videos"/>
<span class="input-group-btn">
<button class="btn btn-secondary" id="pathBtn">
<button class="btn btn-default" id="pathBtn">
<span class="glyphicon glyphicon-list"></span> <?php echo __("List Files"); ?>
</button>
</span>
<span class="input-group-btn">
<button class="btn btn-secondary" id="checkBtn">
<button class="btn btn-default" id="checkBtn">
<i class="far fa-check-square" aria-hidden="true"></i>
</button>
</span>
<span class="input-group-btn">
<button class="btn btn-secondary" id="uncheckBtn">
<button class="btn btn-default" id="uncheckBtn">
<i class="far fa-square" aria-hidden="true"></i>
</button>
</span>

2
view/js/script.js
View file

@ -886,7 +886,7 @@ function setCurrentTime(currentTime) {
}
function isALiveContent() {
if (typeof isLive !== 'undefined' && isLive) {
if (typeof isLive !== 'undefined' && isLive && (typeof isOnlineLabel === 'undefined' || isOnlineLabel===true)) {
return true;
}
return false;

2
view/managerVideos_body.php
View file

@ -186,7 +186,7 @@
<div class="panel panel-default">
<div class="panel-body">
<div class="btn-group" id="actionButtonsVideoManager">
<button class="btn btn-secondary" id="checkBtn">
<button class="btn btn-default" id="checkBtn">
<i class="far fa-square" aria-hidden="true" id="chk"></i>
</button>
<?php if (!$config->getDisable_youtubeupload()) { ?>