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

Merge origin/master

Browse source 
Conflicts:
	view/modeYoutube.php
This commit is contained in:
daniel 2018-04-25 15:40:34 -03:00
commit b50cd47538
10 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
objects/user.php
View file

@ -307,7 +307,7 @@ class User {
$id = $this->id;
}
if ($updateUserGroups) {
require_once './userGroups.php';
require_once $global['systemRootPath'] . 'objects/userGroups.php';
// update the user groups
UserGroups::updateUserGroups($id, $this->userGroups);
}

4
objects/video.php
View file

@ -8,7 +8,7 @@ require_once $global['systemRootPath'] . 'objects/bootGrid.php';
require_once $global['systemRootPath'] . 'objects/user.php';
require_once $global['systemRootPath'] . 'objects/include_config.php';
require_once $global['systemRootPath'] . 'objects/video_statistic.php';
if (!class_exists('Video')) {
class Video {
private $id;
@ -1698,7 +1698,7 @@ class Video {
}
}
}
// just to convert permalink into clean_title
if (!empty($_GET['v']) && empty($_GET['videoName'])) {
$_GET['videoName'] = Video::get_clean_title($_GET['v']);

2
plugin/FBTube/view/getVideos.php
View file

@ -14,9 +14,7 @@ if (!empty($_GET['type'])) {
unset($_SESSION['type']);
}
}
if(empty($_POST['dontLoadVideoPhP'])){
require_once $global['systemRootPath'] . 'objects/video.php';
}
require_once $global['systemRootPath'] . 'objects/video_ad.php';
require_once $global['systemRootPath'] . 'objects/subscribe.php';

4
plugin/FBTube/view/modeFacebook.php
View file

@ -36,7 +36,7 @@ require_once '../videos/configuration.php';
<body>
<?php
include 'include/navbar.php';
include $global['systemRootPath'] . 'view/include/navbar.php';
?>
<div class="container-fluid gallery" itemscope itemtype="http://schema.org/VideoObject">
<div class="col-lg-2 col-md-1 col-sm-1 hidden-xs"></div>
@ -56,7 +56,7 @@ require_once '../videos/configuration.php';
</div>
<?php
include 'include/footer.php';
include $global['systemRootPath'] . 'view/include/footer.php';
?>
<script>

2
plugin/Gallery/view/modeGallery.php
View file

@ -35,9 +35,7 @@ if ((empty($_GET['type'])) && (!empty($currentCatType))) {
unset($_SESSION['type']);
}
}
if(empty($_POST['dontLoadVideoPhP'])){
require_once $global['systemRootPath'] . 'objects/video.php';
}
$orderString = "";
if ($obj->sortReverseable) {
if (strpos($_SERVER['REQUEST_URI'], "?") != false) {

6
plugin/Live/view/swfobject.js
View file

File diff suppressed because one or more lines are too long

3
plugin/YouPHPFlix/view/firstPage.php
View file

@ -7,9 +7,8 @@ if (! file_exists('../videos/configuration.php')) {
}
require_once '../videos/configuration.php';
if(empty($_POST['dontLoadVideoPhP'])){
require_once $global['systemRootPath'] . 'objects/video.php';
}
require_once $global['systemRootPath'] . 'objects/category.php';
$url = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];

2
view/include/audio.php
View file

@ -1,4 +1,3 @@
<?php $_GET['isMediaPlaySite'] = 1; ?>
<div class="row main-video" style="padding: 10px;" id="mvideo">
<div class="col-xs-12 col-sm-12 col-lg-2 firstC"></div>
<div class="col-xs-12 col-sm-12 col-lg-8 secC">
@ -28,6 +27,7 @@
<?php } ?>
</div>
<script>
<?php $_GET['isMediaPlaySite'] = $video['id']; ?>
var mediaId = <?php echo $video['id']; ?>;
$(document).ready(function () {
$(".vjs-big-play-button").hide();

1
view/include/video.php
View file

@ -71,6 +71,7 @@ if (YouPHPTubePlugin::isEnabled("0e225f8e-15e2-43d4-8ff7-0cb07c2a2b3b")) {
</div>
<!--/row-->
<script>
<?php $_GET['isMediaPlaySite'] = $playNowVideo['id']; ?>
var mediaId = <?php echo $playNowVideo['id']; ?>;
var player;
$(document).ready(function () {

4
view/modeYoutube.php
View file

@ -577,7 +577,7 @@ $advancedCustom = YouPHPTubePlugin::getObjectDataIfEnabled("CustomizeAdvanced");
});
</script>
<div class="row bgWhite list-group-item">
<?php include './videoComments.php'; ?>
<?php include $global['systemRootPath'] . 'view/videoComments.php'; ?>
</div>
</div>
<div class="col-sm-4 col-md-4 bgWhite list-group-item rightBar">
@ -681,7 +681,7 @@ $advancedCustom = YouPHPTubePlugin::getObjectDataIfEnabled("CustomizeAdvanced");
<div class="col-lg-12 col-sm-12 col-xs-12 extraVideos nopadding"></div>
<!-- videos List -->
<div id="videosList">
<?php include './videosList.php'; ?>
<?php include $global['systemRootPath'] . 'view/videosList.php'; ?>
</div>
<!-- End of videos List -->