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

https://github.com/WWBN/AVideo/issues/8519

Browse source
This commit is contained in:
Daniel Neto 2023-10-13 13:10:59 -03:00
parent 9f8579c713
commit f327d7886b
16 changed files with 145 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

8
objects/functions.php
View file

@ -4861,14 +4861,14 @@ function TimeLogEnd($name, $line, $TimeLogLimit = 0.7) {
$backtrace = ' backtrace=' . json_encode(debug_backtrace());
}
$ua = ' IP='.getRealIpAddr();
if (!empty($_SERVER['HTTP_USER_AGENT'])) {
$ua = '';
if(isBot()){
$ua = " BOT ";
}
$ua .= " BOT ";
$ua .= " USER_AGENT={$_SERVER['HTTP_USER_AGENT']}";
}
}else{
$ua = " USER_AGENT=Undefined server=".json_encode($_SERVER);
$ua .= " USER_AGENT=Undefined server=".json_encode($_SERVER);
}
_error_log("Time: ". str_pad(number_format($total_time,3) . "s", 8) . " | Limit: {$TimeLogLimit}s | Location: {$_SERVER["SCRIPT_FILENAME"]} Line {$line} [{$name}]{$ua}{$backtrace}", $type);

34
objects/video.php
View file

@ -1069,7 +1069,7 @@ if (!class_exists('Video')) {
//. ", (SELECT count(id) FROM likes as l where l.videos_id = v.id AND `like` = -1 ) as dislikes "
;
if (User::isLogged()) {
$sql .= ", (SELECT `like` FROM likes as l where l.videos_id = v.id AND users_id = '" . User::getId() . "' ) as myVote ";
$sql .= ", (SELECT `like` FROM likes as l where l.videos_id = v.id AND users_id = '" . User::getId() . "' LIMIT 1 ) as myVote ";
} else {
$sql .= ", 0 as myVote ";
}
@ -1245,7 +1245,7 @@ if (!class_exists('Video')) {
$sql .= " LIMIT {$firstClauseLimit}1";
}
$lastGetVideoSQL = $sql;
//echo $sql, "<br>";var_dump(debug_backtrace());exit;
//echo $sql, "<br>";//var_dump(debug_backtrace());exit;
$res = sqlDAL::readSql($sql);
$video = sqlDAL::fetchAssoc($res);
if (!empty($video['id'])) {
@ -5665,14 +5665,36 @@ if (!class_exists('Video')) {
return $this->rrating;
}
public function getRratingHTML()
public static function getRratingHTML($rrating )
{
global $global;
if (!empty($this->rrating)) {
$filePath = $global['systemRootPath'] . 'view/rrating/rating-' . $this->rrating . '.php';
if (!empty($rrating )) {
$filePath = $global['systemRootPath'] . 'view/rrating/rating-' . $rrating . '.php';
if (file_exists($filePath)) {
return getIncludeFileContent($filePath);
$return = getIncludeFileContent($filePath);
return $return;
}
} else if (!empty($advancedCustom) && $advancedCustom->showNotRatedLabel) {
include $global['systemRootPath'] . 'view/rrating/notRated.php';
}
return '';
}
public static function getRratingIMG($rrating, $style='' )
{
global $global;
if (!empty($rrating )) {
return '<img src="'.getURL('view/rrating/rating-' . $rrating . '.png').'" class="img img-responsive zoom" style="'.$style.'" /> ';
}
return '';
}
public static function getRratingText($rrating)
{
global $global;
if (!empty($rrating )) {
include $global['systemRootPath'] . 'view/rrating/rating-' . $rrating . '_text.php';
}
return '';
}

10
plugin/CustomizeAdvanced/confirmRating.php
View file

@ -68,17 +68,17 @@ $ogURL = Video::getLinkToVideo($video['id'], $video['clean_title'], false, false
<div class="modal-body">
<div class="row">
<div class="col-sm-2">
<img src="<?php echo getURL('view/rrating/rating-' . $video['rrating'] . '.png'); ?>" class="img img-responsive" />
<?php
echo Video::getRratingIMG($video['rrating']);
?>
</div>
<div class="col-sm-4">
<img src="<?php echo $img; ?>" class="img img-responsive"/>
</div>
<div class="col-sm-6">
<center>
<div class="col-sm-6 text-center">
<?php
include $global['systemRootPath'] . 'view/rrating/rating-' . $video['rrating'] . '_text.php';
echo Video::getRratingText($video['rrating']);
?>
</center>
</div>
</div>
</div>

5
plugin/PlayLists/footer.php
View file

@ -1,16 +1,19 @@
<script>
var playListsAdding = false;
var playListsReloading = false;
var playList = [];
async function reloadPlayLists() {
if (!isOnline()) {
if (!isOnline() || playListsReloading) {
return false;
}
playListsReloading = true;
//console.log('reloadPlayLists');
$.ajax({
url: webSiteRootURL + 'objects/playlists.json.php',
success: function (response) {
playList = response;
reloadPlayListButtons();
playListsReloading = false;
}
});
}

6
plugin/YouPHPFlix2/view/BigVideoInfoDetails.php
View file

@ -60,10 +60,6 @@ if (!empty($ads1)) {
}
?>
<?php
if (!empty($video['rrating'])) {
include $global['systemRootPath'] . 'view/rrating/rating-' . $video['rrating'] . '.php';
} else if (!empty($advancedCustom) && $advancedCustom->showNotRatedLabel) {
include $global['systemRootPath'] . 'view/rrating/notRated.php';
}
Video::getRratingHTML($video['rrating'] );
?>
</div>

8
plugin/YouPHPFlix2/view/row_info.php
View file

@ -54,13 +54,7 @@ TimeLogStart($timeLog6);
TimeLogEnd($timeLog6, __LINE__, $timeLog6Limit);
?>
<?php
TimeLogEnd($timeLog6, __LINE__, $timeLog6Limit);
if (!empty($value['rrating'])) {
include $global['systemRootPath'] . 'view/rrating/rating-' . $value['rrating'] . '.php';
} else if (!empty($advancedCustom) && $advancedCustom->showNotRatedLabel) {
include $global['systemRootPath'] . 'view/rrating/notRated.php';
}
TimeLogEnd($timeLog6, __LINE__, $timeLog6Limit);
Video::getRratingHTML($value['rrating'] );
?>
</div>
<div class="row">

16
view/css/main.css
View file

@ -905,7 +905,8 @@ img.blur {
#CloseButtonInVideo {
display: flex;
justify-content: center; /* Horizontally centers the content (i.e., the <i> element) */
justify-content: center;
/* Horizontally centers the content (i.e., the <i> element) */
align-items: center;
z-index: 9999;
position: fixed;
@ -917,6 +918,7 @@ img.blur {
height: 25px;
width: 25px;
}
#CloseButtonInVideo:hover {
background-color: rgba(255, 255, 255, 1);
color: #000;
@ -2021,21 +2023,25 @@ body.ypt-is-compressed #videoCol {
.ImagesPlaceHoldersDefaultImage {
filter: grayscale(100%);
background-color: rgba(128, 128, 128, 0.25); /* This is the grey background with 80% transparency */
transition: filter 0.3s ease, background-color 0.3s ease; /* This ensures a smooth transition effect */
background-color: rgba(128, 128, 128, 0.25);
/* This is the grey background with 80% transparency */
transition: filter 0.3s ease, background-color 0.3s ease;
/* This ensures a smooth transition effect */
}
.thumbsImageContainer:hover .ImagesPlaceHoldersDefaultImage,
.ImagesPlaceHoldersDefaultImage:hover {
filter: grayscale(0%);
background-color: rgba(128, 128, 128, 0.5); /* This is the grey background with 50% transparency on hover */
background-color: rgba(128, 128, 128, 0.5);
/* This is the grey background with 50% transparency on hover */
}
.croppie-container .cr-boundary {
border: 2px solid grey;
}
#topMenuUserNotifications {
#topMenuUserNotifications,
.webui-popover-content {
display: none;
}

10
view/managerVideos_body.php
View file

@ -114,13 +114,16 @@ require_once $global['systemRootPath'] . 'objects/video.php';
display: flex;
margin-bottom: 5px;
}
.typeFormat .tagTitle {
width: 40% !important;
}
.typeLabels {
display: inline-grid;
width: 100%;
}
.typeLabels span {
width: 100% !important;
}
@ -1900,9 +1903,14 @@ if (empty($advancedCustom->disableHTMLDescription)) {
continue;
}
var text = row.tags[i].text;
if (typeof row.tags[i].tooltip !== "undefined") {
if (typeof row.tags[i].tooltip !== "undefined" && text != row.tags[i].tooltip) {
text += ' ' + row.tags[i].tooltip;
}
if (typeof row.tags[i].tooltipIcon !== "undefined") {
text = row.tags[i].tooltipIcon + ' ' + text;
}
tags += "<div class=\"clearfix\"></div><span class='label label-primary tagTitle'>" + row.tags[i].label + ": </span><span class=\"label label-" + row.tags[i].type + " \">" + text + "</span>";
}
tags += "<div class=\"clearfix\"></div><span class='label label-primary tagTitle'><?php echo __("Type") . ":"; ?> </span><span class=\"label label-default \">" + row.type + "</span>";

1
view/managerVideos_form.php
View file

@ -249,6 +249,7 @@
$label = __("Not Rated");
} else {
$label = strtoupper($value);
$label = "[{$label}] ".Video::$rratingOptionsText[$value];
}
echo "<option value='{$value}'>" . __($label) . "</option>";
}

47
view/modeYoutubeBottom.php
View file

@ -46,9 +46,19 @@ $cdnStorageEnabled = !empty($cdnObj) && $cdnObj->enable_storage;
$description = getSEODescription(emptyHTML($video['description']) ? $video['title'] : $video['description']);
?>
<style>
.showWhenProcessing {
display: none;
}
.processing .showWhenNotProcessing {
display: none;
}
.processing .showWhenProcessing {
display: inline-block;
}
</style>
<div class="panel panel-default">
<div class="panel-body">
<?php
@ -201,25 +211,41 @@ $description = getSEODescription(emptyHTML($video['description']) ? $video['titl
<?php
if (!empty($video['id']) && empty($advancedCustom->removeThumbsUpAndDown)) {
?>
<a href="#" class="faa-parent animated-hover btn btn-default no-outline pull-right <?php echo (@$video['myVote'] == -1) ? "myVote" : "" ?>" id="dislikeBtn" <?php if (!User::isLogged()) { ?> data-toggle="tooltip" title="<?php echo __("Don´t like this video? Sign in to make your opinion count."); ?>" <?php } ?>>
<span class="fa fa-thumbs-down faa-bounce faa-reverse "></span> <small><?php echo $video['dislikes']; ?></small>
<a href="#" class="likedislikebtn faa-parent animated-hover btn btn-default no-outline pull-right
<?php echo (@$video['myVote'] == -1) ? "myVote" : "" ?>" id="dislikeBtn" <?php if (!User::isLogged()) { ?> data-toggle="tooltip" title="<?php echo __("Don´t like this video? Sign in to make your opinion count."); ?>" <?php } ?>>
<span class="fa fa-thumbs-down faa-bounce faa-reverse "></span>
<small class="showWhenNotProcessing"><?php echo $video['dislikes']; ?></small>
<div class="showWhenProcessing">
<i class="fas fa-spinner fa-spin"></i>
</div>
</a>
<a href="#" class="faa-parent animated-hover btn btn-default no-outline pull-right <?php echo (@$video['myVote'] == 1) ? "myVote" : "" ?>" id="likeBtn" <?php if (!User::isLogged()) { ?> data-toggle="tooltip" title="<?php echo __("Like this video? Sign in to make your opinion count."); ?>" <?php } ?>>
<a href="#" class="likedislikebtn faa-parent animated-hover btn btn-default no-outline pull-right
<?php echo (@$video['myVote'] == 1) ? "myVote" : "" ?>" id="likeBtn" <?php if (!User::isLogged()) { ?> data-toggle="tooltip" title="<?php echo __("Like this video? Sign in to make your opinion count."); ?>" <?php } ?>>
<span class="fa fa-thumbs-up faa-bounce"></span>
<small><?php echo $video['likes']; ?></small>
<small class="showWhenNotProcessing"><?php echo $video['likes']; ?></small>
<div class="showWhenProcessing">
<i class="fas fa-spinner fa-spin"></i>
</div>
</a>
<script>
$(document).ready(function() {
<?php if (User::isLogged()) { ?>
$("#dislikeBtn, #likeBtn").click(function() {
$(".likedislikebtn").click(function() {
if ($(".likedislikebtn").hasClass("processing")) {
avideoToastError(__('Please wait'));
return false;
}
$(".likedislikebtn").addClass("processing");
var btnId = $(this).attr("id");
$.ajax({
url: webSiteRootURL + ($(this).attr("id") == "dislikeBtn" ? "dislike" : "like"),
url: webSiteRootURL + (btnId == "dislikeBtn" ? "dislike" : "like"),
method: 'POST',
data: {
'videos_id': <?php echo $video['id']; ?>
},
success: function(response) {
$("#likeBtn, #dislikeBtn").removeClass("myVote");
$(".likedislikebtn").removeClass("processing");
$(".likedislikebtn").removeClass("myVote");
if (response.myVote == 1) {
$("#likeBtn").addClass("myVote");
} else if (response.myVote == -1) {
@ -311,7 +337,10 @@ $description = getSEODescription(emptyHTML($video['description']) ? $video['titl
<div class="col-xs-4 col-sm-2 col-lg-2 text-right"><strong><?php echo __("Rating"); ?>:</strong></div>
<div class="col-xs-8 col-sm-10 col-lg-10">
<img src="<?php echo getURL('view/rrating/rating-' . $video['rrating'] . '.png'); ?>" class="img img-responsive zoom" style="width:30px;" />
<?php
//echo Video::getRratingIMG($video['rrating'], 'width:30px;');
echo Video::getRratingHTML($video['rrating']);
?>
</div>
<?php

8
view/rrating/rating-g.php
View file

@ -1,6 +1,8 @@
<button class="btn btn-default btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
<div>
<button data-toggle="tooltip" title="<?php echo Video::$rratingOptionsText['g']; ?>" class="btn btn-success btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
G
<table class="table-bordered" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
</button>
<table class="table-bordered bg-warning" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
<tr>
<td rowspan="2" style="font-size: 1.5em; font-weight: bold; padding: 1px 2px;">G</td>
<td style="font-size: 0.8em; text-align: center; font-weight: bold; padding: 1px 2px;"><?php echo strtoupper(__("General Audiences")); ?></td>
@ -9,4 +11,4 @@
<td style="font-size: 0.8em; text-align: center; padding: 1px 2px;"><?php echo strtoupper(__("All Ages Admitted")); ?></td>
</tr>
</table>
</button>
</div>

8
view/rrating/rating-ma.php
View file

@ -1,9 +1,11 @@
<button class="btn btn-default btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
<div>
<button data-toggle="tooltip" title="<?php echo Video::$rratingOptionsText['ma']; ?>" class="btn btn-danger btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
MA
<table class="table-bordered" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
</button>
<table class="table-bordered bg-warning" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
<tr>
<td style="font-size: 1.5em; text-align: center; font-weight: bold; padding: 1px 2px;">MA</td>
<td style="font-size: 0.8em; text-align: center; font-weight: bold; padding: 1px 2px;"><?php echo strtoupper(__("For mature audiences")); ?></td>
</tr>
</table>
</button>
</div>

8
view/rrating/rating-nc-17.php
View file

@ -1,9 +1,11 @@
<button class="btn btn-default btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
<div>
<button data-toggle="tooltip" title="<?php echo Video::$rratingOptionsText['nc-17']; ?>" class="btn btn-danger btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
NC-17
<table class="table-bordered" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
</button>
<table class="table-bordered bg-warning" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
<tr>
<td style="font-size: 1.5em; text-align: center; font-weight: bold; padding: 1px 2px;">NC-17</td>
<td style="font-size: 0.8em; text-align: center; font-weight: bold; padding: 1px 2px;"><?php echo strtoupper(__("No one 17 and under admitted")); ?></td>
</tr>
</table>
</button>
</div>

8
view/rrating/rating-pg-13.php
View file

@ -1,6 +1,8 @@
<button class="btn btn-default btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
<div>
<button data-toggle="tooltip" title="<?php echo Video::$rratingOptionsText['pg-13']; ?>" class="btn btn-warning btn-outline btn-xs btn-sm" onclick="$(this).parent().find('table').slideToggle();" style="position: relative;">
PG-13
<table class="table-bordered" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
</button>
<table class="table-bordered bg-warning" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
<tr>
<td style="font-size: 1.5em; text-align: center; font-weight: bold; padding: 1px 2px;">PG-13</td>
<td style="font-size: 0.8em; text-align: center; font-weight: bold; padding: 1px 2px;"><?php echo strtoupper(__("Parental Guidance Suggested")); ?></td>
@ -9,4 +11,4 @@
<td colspan="2" style="font-size: 0.7em; text-align: center; padding: 1px 2px;"><?php echo strtoupper(__("Some material may not be inapropriate for children under 13")); ?></td>
</tr>
</table>
</button>
</div>

8
view/rrating/rating-pg.php
View file

@ -1,6 +1,8 @@
<button class="btn btn-default btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
<div>
<button data-toggle="tooltip" title="<?php echo Video::$rratingOptionsText['pg']; ?>" class="btn btn-warning btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
PG
<table class="table-bordered" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
</button>
<table class="table-bordered bg-warning" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
<tr>
<td style="font-size: 1.5em; text-align: center; font-weight: bold; padding: 1px 2px;">PG</td>
<td style="font-size: 0.8em; text-align: center; font-weight: bold; padding: 1px 2px;"><?php echo strtoupper(__("Parental Guidance Suggested")); ?></td>
@ -9,4 +11,4 @@
<td colspan="2" style="font-size: 0.7em; text-align: center; padding: 1px 2px;"><?php echo strtoupper(__("Some material may not be suitable for children")); ?></td>
</tr>
</table>
</button>
</div>

8
view/rrating/rating-r.php
View file

@ -1,6 +1,8 @@
<button class="btn btn-default btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
<div>
<button data-toggle="tooltip" title="<?php echo Video::$rratingOptionsText['r']; ?>" class="btn btn-danger btn-outline btn-xs btn-sm" onclick="$(this).find('table').slideToggle();" style="position: relative;">
R
<table class="table-bordered" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
</button>
<table class="table-bordered bg-warning" style="z-index: 1;border: 2px solid #555; border-radius: 4px; margin: 2px;border-collapse: separate !important; display: none; position: absolute; left: 0;">
<tr>
<td style="font-size: 1.5em; text-align: center; font-weight: bold; padding: 1px 2px;">R</td>
<td style="font-size: 0.8em; text-align: center; font-weight: bold; padding: 1px 2px;"><?php echo strtoupper(__("Restricted")); ?></td>
@ -9,4 +11,4 @@
<td colspan="2" style="font-size: 0.7em; text-align: center; padding: 1px 2px;"><?php echo strtoupper(__("Under 17 requires accompanying parent or adult guardian")); ?></td>
</tr>
</table>
</button>
</div>