mirror of
https://github.com/DanielnetoDotCom/YouPHPTube
synced 2025-10-03 01:39:24 +02:00
Update
This commit is contained in:
parent
b565543ec0
commit
0c745c6352
8 changed files with 22 additions and 6 deletions
|
@ -1807,11 +1807,6 @@ if (!class_exists('Video')) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($videosArrayId) && is_array($videosArrayId) && (is_numeric($videosArrayId[0]))) {
|
|
||||||
$sql .= " ORDER BY FIELD(v.id, '" . implode("', '", $videosArrayId) . "') ";
|
|
||||||
} else {
|
|
||||||
$sql .= self::getSQLByStatus($status, $showUnlisted);
|
|
||||||
}
|
|
||||||
//var_dump($max_duration_in_seconds);echo $sql;exit;
|
//var_dump($max_duration_in_seconds);echo $sql;exit;
|
||||||
$sql .= Video::getCatSQL();
|
$sql .= Video::getCatSQL();
|
||||||
|
|
||||||
|
@ -1878,6 +1873,10 @@ if (!class_exists('Video')) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql .= self::getSQLSort($sortType, $showOnlyLoggedUserVideos, $showUnlisted, $suggestedOnly);
|
$sql .= self::getSQLSort($sortType, $showOnlyLoggedUserVideos, $showUnlisted, $suggestedOnly);
|
||||||
|
}else if (!empty($videosArrayId) && is_array($videosArrayId) && (is_numeric($videosArrayId[0]))) {
|
||||||
|
$sql .= " ORDER BY FIELD(v.id, '" . implode("', '", $videosArrayId) . "') ";
|
||||||
|
} else {
|
||||||
|
$sql .= self::getSQLByStatus($status, $showUnlisted);
|
||||||
}
|
}
|
||||||
if (strpos(mb_strtolower($sql), 'limit') === false) {
|
if (strpos(mb_strtolower($sql), 'limit') === false) {
|
||||||
if (!empty($_GET['limitOnceToOne'])) {
|
if (!empty($_GET['limitOnceToOne'])) {
|
||||||
|
|
|
@ -389,6 +389,8 @@ function createGallerySectionVideo($video, $showChannel = true, $screenColsLarge
|
||||||
<?php echo $humanTiming; ?>
|
<?php echo $humanTiming; ?>
|
||||||
</time>
|
</time>
|
||||||
<?php
|
<?php
|
||||||
|
}else{
|
||||||
|
echo '<!-- empty showCreationTimeOnVideoItem '.basename(__FILE__).' line='.__LINE__.'-->';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -175,6 +175,8 @@ if ($obj->BigVideo && empty($_GET['showOnly'])) {
|
||||||
<?php echo humanTiming(strtotime($videoRow['videoCreation']), 0, true, true); ?>
|
<?php echo humanTiming(strtotime($videoRow['videoCreation']), 0, true, true); ?>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
|
}else{
|
||||||
|
echo '<!-- empty showCreationTimeOnVideoItem '.basename(__FILE__).' line='.__LINE__.'-->';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<?php
|
<?php
|
||||||
|
|
|
@ -251,6 +251,8 @@ unset($_POST['current']);
|
||||||
<?php echo humanTiming(strtotime($value['videoCreation']), 0, true, true); ?>
|
<?php echo humanTiming(strtotime($value['videoCreation']), 0, true, true); ?>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
|
}else{
|
||||||
|
echo '<!-- empty showCreationTimeOnVideoItem '.basename(__FILE__).' line='.__LINE__.'-->';
|
||||||
}
|
}
|
||||||
if (!empty($advancedCustom->showChannelNameOnVideoItem)) {
|
if (!empty($advancedCustom->showChannelNameOnVideoItem)) {
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -200,6 +200,8 @@ $_page->setExtraStyles(
|
||||||
<?php echo humanTiming(strtotime($value['videoCreation']), 0, true, true); ?>
|
<?php echo humanTiming(strtotime($value['videoCreation']), 0, true, true); ?>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
|
}else{
|
||||||
|
echo '<!-- empty showCreationTimeOnVideoItem '.basename(__FILE__).' line='.__LINE__.'-->';
|
||||||
}
|
}
|
||||||
if (!empty($advancedCustom->showChannelNameOnVideoItem)) {
|
if (!empty($advancedCustom->showChannelNameOnVideoItem)) {
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -200,6 +200,8 @@ if (!empty($evideo)) {
|
||||||
if (!empty($advancedCustom->showCreationTimeOnVideoItem)) {
|
if (!empty($advancedCustom->showCreationTimeOnVideoItem)) {
|
||||||
$created = !empty($video['videoCreation']) ? $video['videoCreation'] : $video['created'];
|
$created = !empty($video['videoCreation']) ? $video['videoCreation'] : $video['created'];
|
||||||
$html = '<div class="clearfix"></div><small>' . humanTiming(_strtotime($created)) . '</small>';
|
$html = '<div class="clearfix"></div><small>' . humanTiming(_strtotime($created)) . '</small>';
|
||||||
|
}else{
|
||||||
|
$html = '<!-- empty showCreationTimeOnVideoItem '.basename(__FILE__).' line='.__LINE__.'-->';
|
||||||
}
|
}
|
||||||
$video['creator'] = Video::getCreatorHTML($video['users_id'], $html);
|
$video['creator'] = Video::getCreatorHTML($video['users_id'], $html);
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,17 @@ if (empty($global['systemRootPath'])) {
|
||||||
require_once '../videos/configuration.php';
|
require_once '../videos/configuration.php';
|
||||||
}
|
}
|
||||||
require_once $global['systemRootPath'] . 'objects/subscribe.php';
|
require_once $global['systemRootPath'] . 'objects/subscribe.php';
|
||||||
if ((empty($video) || !is_array($video)) && !empty($_GET['videos_id'])) {
|
if((empty($video) || !is_array($video)) && !empty($_GET['videos_id'])){
|
||||||
$video = Video::getVideo(intval($_GET['videos_id']), Video::SORT_TYPE_VIEWABLE, true, false, true, true);
|
$video = Video::getVideo(intval($_GET['videos_id']), Video::SORT_TYPE_VIEWABLE, true, false, true, true);
|
||||||
|
}
|
||||||
|
if (is_array($video)) {
|
||||||
$html = '';
|
$html = '';
|
||||||
|
//var_dump(__LINE__, !empty($advancedCustom->showCreationTimeOnVideoItem));exit;
|
||||||
if (!empty($advancedCustom->showCreationTimeOnVideoItem)) {
|
if (!empty($advancedCustom->showCreationTimeOnVideoItem)) {
|
||||||
$created = !empty($video['videoCreation']) ? $video['videoCreation'] : $video['created'];
|
$created = !empty($video['videoCreation']) ? $video['videoCreation'] : $video['created'];
|
||||||
$html = '<div class="clearfix"></div><small>' . humanTiming(_strtotime($created)) . '</small>';
|
$html = '<div class="clearfix"></div><small>' . humanTiming(_strtotime($created)) . '</small>';
|
||||||
|
}else{
|
||||||
|
$html = '<!-- empty showCreationTimeOnVideoItem '.basename(__FILE__).' line='.__LINE__.'-->';
|
||||||
}
|
}
|
||||||
$video['creator'] = Video::getCreatorHTML($video['users_id'], $html);
|
$video['creator'] = Video::getCreatorHTML($video['users_id'], $html);
|
||||||
$source = Video::getSourceFile($video['filename']);
|
$source = Video::getSourceFile($video['filename']);
|
||||||
|
|
|
@ -124,6 +124,8 @@ $_page->setExtraStyles(
|
||||||
<?php echo humanTiming(strtotime($value['videoCreation']), 0, true, true); ?>
|
<?php echo humanTiming(strtotime($value['videoCreation']), 0, true, true); ?>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
|
}else{
|
||||||
|
echo '<!-- empty showCreationTimeOnVideoItem '.basename(__FILE__).' line='.__LINE__.'-->';
|
||||||
}
|
}
|
||||||
if (!empty($advancedCustom->showChannelNameOnVideoItem)) {
|
if (!empty($advancedCustom->showChannelNameOnVideoItem)) {
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue