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

Show categories top image

Browse source 
Improve close button for fullscreen play
This commit is contained in:
DanielnetoDotCom 2020-12-21 10:30:09 -03:00
parent d3f8093f86
commit e5f2fd1d59
21 changed files with 373 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

191
objects/category.php
View file

@ -72,37 +72,38 @@ class Category {
function setParentId($parentId) {
$this->parentId = $parentId;
}
/*
function setType($type, $overwriteUserId = 0) {
global $global;
$internalId = $overwriteUserId;
if (empty($internalId)) {
$internalId = $this->id;
}
$exist = false;
// require this cause of Video::autosetCategoryType - but should be moveable easy here..
require_once dirname(__FILE__) . '/../objects/video.php';
$sql = "SELECT * FROM `category_type_cache` WHERE categoryId = ?";
$res = sqlDAL::readSql($sql, "i", array($internalId));
$catTypeCache = sqlDAL::fetchAssoc($res);
sqlDAL::close($res);
if ($catTypeCache != false) {
$exist = true;
}
if ($type == "3") {
// auto-cat-type
Video::autosetCategoryType($internalId);
} else {
if ($exist) {
$sql = "UPDATE `category_type_cache` SET `type` = ?, `manualSet` = '1' WHERE `category_type_cache`.`categoryId` = ?;";
sqlDAL::writeSql($sql, "si", array($type, $internalId));
} else {
$sql = "INSERT INTO `category_type_cache` (`categoryId`, `type`, `manualSet`) VALUES (?,?,'1')";
sqlDAL::writeSql($sql, "is", array($internalId, $type));
}
}
}
/*
function setType($type, $overwriteUserId = 0) {
global $global;
$internalId = $overwriteUserId;
if (empty($internalId)) {
$internalId = $this->id;
}
$exist = false;
// require this cause of Video::autosetCategoryType - but should be moveable easy here..
require_once dirname(__FILE__) . '/../objects/video.php';
$sql = "SELECT * FROM `category_type_cache` WHERE categoryId = ?";
$res = sqlDAL::readSql($sql, "i", array($internalId));
$catTypeCache = sqlDAL::fetchAssoc($res);
sqlDAL::close($res);
if ($catTypeCache != false) {
$exist = true;
}
if ($type == "3") {
// auto-cat-type
Video::autosetCategoryType($internalId);
} else {
if ($exist) {
$sql = "UPDATE `category_type_cache` SET `type` = ?, `manualSet` = '1' WHERE `category_type_cache`.`categoryId` = ?;";
sqlDAL::writeSql($sql, "si", array($type, $internalId));
} else {
$sql = "INSERT INTO `category_type_cache` (`categoryId`, `type`, `manualSet`) VALUES (?,?,'1')";
sqlDAL::writeSql($sql, "is", array($internalId, $type));
}
}
}
*
*/
@ -202,26 +203,26 @@ class Category {
}
static function fixCleanTitle($clean_title, $count, $id, $original_title = "") {
global $global;
global $global;
if (empty($original_title)) {
$original_title = $clean_title;
}
$sql = "SELECT * FROM categories WHERE clean_name = '{$clean_title}' ";
if (!empty($id)) {
$sql .= " AND id != {$id} ";
}
$sql .= " LIMIT 1";
$res = sqlDAL::readSql($sql, "", array(), true);
$cleanTitleExists = sqlDAL::fetchAssoc($res);
sqlDAL::close($res);
if ($cleanTitleExists != false) {
return self::fixCleanTitle($original_title . "-" . $count, $count + 1, $id, $original_title);
}
return $clean_title;
if (empty($original_title)) {
$original_title = $clean_title;
}
$sql = "SELECT * FROM categories WHERE clean_name = '{$clean_title}' ";
if (!empty($id)) {
$sql .= " AND id != {$id} ";
}
$sql .= " LIMIT 1";
$res = sqlDAL::readSql($sql, "", array(), true);
$cleanTitleExists = sqlDAL::fetchAssoc($res);
sqlDAL::close($res);
if ($cleanTitleExists != false) {
return self::fixCleanTitle($original_title . "-" . $count, $count + 1, $id, $original_title);
}
return $clean_title;
}
function delete() {
if (!self::canCreateCategory()) {
return false;
@ -240,7 +241,7 @@ class Category {
if (!empty($this->id)) {
$_SESSION['getAllCategoriesClearCache'] = 1;
$categories_id = self::getSiteCategoryDefaultID();
if($categories_id){
if ($categories_id) {
$sql = "UPDATE videos SET categories_id = ? WHERE categories_id = ?";
sqlDAL::writeSql($sql, "ii", array($categories_id, $this->id));
}
@ -253,28 +254,28 @@ class Category {
return sqlDAL::writeSql($sql, "i", array($this->id));
}
static function deleteAssets($categories_id){
static function deleteAssets($categories_id) {
$dirPaths = self::getCategoryDirPath($categories_id);
return rrmdir($dirPaths['path']);
}
/*
static function getCategoryType($categoryId) {
global $global;
$sql = "SELECT * FROM `category_type_cache` WHERE categoryId = ?;";
$res = sqlDAL::readSql($sql, "i", array($categoryId));
$data = sqlDAL::fetchAssoc($res);
sqlDAL::close($res);
if ($res) {
if (!empty($data)) {
return $data;
} else {
return array("categoryId" => "-1", "type" => "0", "manualSet" => "0");
}
} else {
return array("categoryId" => "-1", "type" => "0", "manualSet" => "0");
}
}
static function getCategoryType($categoryId) {
global $global;
$sql = "SELECT * FROM `category_type_cache` WHERE categoryId = ?;";
$res = sqlDAL::readSql($sql, "i", array($categoryId));
$data = sqlDAL::fetchAssoc($res);
sqlDAL::close($res);
if ($res) {
if (!empty($data)) {
return $data;
} else {
return array("categoryId" => "-1", "type" => "0", "manualSet" => "0");
}
} else {
return array("categoryId" => "-1", "type" => "0", "manualSet" => "0");
}
}
*
*/
@ -335,11 +336,11 @@ class Category {
static function getSiteCategoryDefaultID() {
$obj = AVideoPlugin::getObjectDataIfEnabled("PredefinedCategory");
$id = false;
if($obj){
if ($obj) {
$id = $obj->defaultCategory;
}else{
} else {
$row = self::getCategoryDefault();
if($row){
if ($row) {
$id = $row['id'];
}
}
@ -375,13 +376,13 @@ class Category {
$sql .= BootGrid::getSqlFromPost(array('name'), "", " ORDER BY `order`, name ASC ");
$cacheName = md5($sql);
if(empty($_SESSION['getAllCategoriesClearCache'])){
if (empty($_SESSION['getAllCategoriesClearCache'])) {
$category = object_to_array(ObjectYPT::getCache($cacheName, 36000));
}else{
} else {
_session_start();
unset($_SESSION['getAllCategoriesClearCache']);
}
if(empty($category)){
if (empty($category)) {
$res = sqlDAL::readSql($sql);
$fullResult = sqlDAL::fetchAllAssoc($res);
sqlDAL::close($res);
@ -395,7 +396,7 @@ class Category {
$row['canEdit'] = self::userCanEditCategory($row['id']);
$row['canAddVideo'] = self::userCanAddInCategory($row['id']);
$row['hierarchy'] = self::getHierarchyString($row['parentId']);
$row['hierarchyAndName'] = $row['hierarchy'].$row['name'];
$row['hierarchyAndName'] = $row['hierarchy'] . $row['name'];
$category[] = $row;
}
//$category = $res->fetch_all(MYSQLI_ASSOC);
@ -408,8 +409,8 @@ class Category {
return $category;
}
static function getHierarchyArray($categories_id, $hierarchyArray = array()){
if(empty($categories_id)){
static function getHierarchyArray($categories_id, $hierarchyArray = array()) {
if (empty($categories_id)) {
return $hierarchyArray;
}
$sql = "SELECT * FROM categories WHERE id=? ";
@ -423,19 +424,19 @@ class Category {
return $hierarchyArray;
}
static function getHierarchyString($categories_id){
if(empty($categories_id)){
static function getHierarchyString($categories_id) {
if (empty($categories_id)) {
return "/";
}
$array = array_reverse(self::getHierarchyArray($categories_id));
//$array = (self::getHierarchyArray($categories_id));
//var_dump($array);exit;
if(empty($array)){
if (empty($array)) {
return "/";
}
$str = "/";
foreach ($array as $value) {
$str .= xss_esc_back($value['name'])."/";
$str .= xss_esc_back($value['name']) . "/";
}
return $str;
}
@ -530,7 +531,7 @@ class Category {
return self::getChildCategories($row['id']);
}
static function getTotalVideosFromCategory($categories_id, $showUnlisted = false, $getAllVideos = false, $renew=false) {
static function getTotalVideosFromCategory($categories_id, $showUnlisted = false, $getAllVideos = false, $renew = false) {
global $global, $config;
if ($renew || empty($_SESSION['categoryTotal'][$categories_id][intval($showUnlisted)][intval($getAllVideos)])) {
$sql = "SELECT count(id) as total FROM videos v WHERE 1=1 AND categories_id = ? ";
@ -625,12 +626,12 @@ class Category {
$this->allow_download = intval($allow_download);
}
static function getCategoryDirPath($categories_id=""){
static function getCategoryDirPath($categories_id = "") {
global $global;
$dir = "videos/categories/assets/";
if(!empty($categories_id)){
$dir .= $categories_id."/";
if (!empty($categories_id)) {
$dir .= $categories_id . "/";
}
$path = array();
@ -641,19 +642,28 @@ class Category {
return $path;
}
static function getCategoryPhotoPath($categories_id){
static function isAssetsValids($categories_id) {
$photo = Category::getCategoryPhotoPath($categories_id);
$background = Category::getCategoryBackgroundPath($categories_id);
if(!file_exists($photo['path']) || !file_exists($background['path'])){
return false;
}
return true;
}
static function getCategoryPhotoPath($categories_id) {
return self::getCategoryAssetPath("photo.png", $categories_id);
}
static function getCategoryBackgroundPath($categories_id){
static function getCategoryBackgroundPath($categories_id) {
return self::getCategoryAssetPath("background.png", $categories_id);
}
private static function getCategoryAssetPath($name, $categories_id){
if(empty($categories_id)){
private static function getCategoryAssetPath($name, $categories_id) {
if (empty($categories_id)) {
return false;
}
if(empty($name)){
if (empty($name)) {
return false;
}
@ -665,13 +675,12 @@ class Category {
$path['dir'] = $dirPaths['url'];
$path['path'] = "{$dirPaths['path']}{$name}";
$path['url'] = "{$dirPaths['url']}{$name}";
if(file_exists($path['path'])){
$path['url+timestamp'] = "{$path['url']}?". filectime($path['path']);
}else{
if (file_exists($path['path'])) {
$path['url+timestamp'] = "{$path['url']}?" . filectime($path['path']);
} else {
$path['url+timestamp'] = $path['url'];
}
return $path;
}
}

61
objects/functions.php
View file

@ -3839,7 +3839,7 @@ function getRedirectUri() {
return $_GET['redirectUri'];
}
if (!empty($_SERVER["HTTP_REFERER"])) {
return $_GET['redirectUri'];
return $_SERVER["HTTP_REFERER"];
}
return getRequestURI();
}
@ -3862,6 +3862,49 @@ function getSelfURI() {
return $url;
}
function isSameVideoAsSelfURI($url) {
return URLsAreSameVideo($url, getSelfURI());
}
function URLsAreSameVideo($url1, $url2) {
return getVideoIDFromURL($url1) == getVideoIDFromURL($url2);
}
function getVideoIDFromURL($url) {
if (preg_match("/v=([0-9]+)/", $url, $matches)) {
return intval($matches[1]);
}
if (preg_match('/\/video\/([0-9]+)/', $url, $matches)) {
return intval($matches[1]);
}
if (preg_match('/\/videoEmbed\/([0-9]+)/', $url, $matches)) {
return intval($matches[1]);
}
if (preg_match('/\/v\/([0-9]+)/', $url, $matches)) {
return intval($matches[1]);
}
if (preg_match('/\/vEmbed\/([0-9]+)/', $url, $matches)) {
return intval($matches[1]);
}
if (preg_match('/\/article\/([0-9]+)/', $url, $matches)) {
return intval($matches[1]);
}
if (preg_match('/\/articleEmbed\/([0-9]+)/', $url, $matches)) {
return intval($matches[1]);
}
}
function getBackURL() {
$backURL = getRedirectUri();
if (empty($backURL)) {
$backURL = getRequestURI();
}
if (isSameVideoAsSelfURI($backURL)) {
$backURL = $global['webSiteRootURL'];
}
return $backURL;
}
function hasLastSlash($word) {
return substr($word, -1) === '/';
}
@ -4906,7 +4949,7 @@ function downloadHLS($filepath) {
$filepath = escapeshellcmd($filepath);
$outputpath = escapeshellcmd($outputpath);
if (true || !file_exists($outputpath)) {
$command = get_ffmpeg()." -allowed_extensions ALL -y -i {$filepath} -c copy {$outputpath}";
$command = get_ffmpeg() . " -allowed_extensions ALL -y -i {$filepath} -c copy {$outputpath}";
//var_dump($outputfilename, $command, $_GET, $filepath, $quoted);exit;
exec($command . " 2>&1", $output, $return);
if (!empty($return)) {
@ -4982,11 +5025,11 @@ function getCroppie($buttonTitle, $callBackJSFunction,
}
$zoom = 0;
if (empty($viewportHeight)) {
$zoom = ($viewportWidth/$resultWidth);
$viewportHeight = $zoom*$resultHeight;
$zoom = ($viewportWidth / $resultWidth);
$viewportHeight = $zoom * $resultHeight;
}
$boundaryWidth = $viewportWidth+$boundary;
$boundaryHeight = $viewportHeight+$boundary;
$boundaryWidth = $viewportWidth + $boundary;
$boundaryHeight = $viewportHeight + $boundary;
$uid = uniqid();
ob_start();
include $global['systemRootPath'] . 'objects/functionCroppie.php';
@ -5003,15 +5046,15 @@ function getCroppie($buttonTitle, $callBackJSFunction,
);
}
function saveCroppieImage($destination, $postIndex="imgBase64") {
if(empty($_POST[$postIndex])){
function saveCroppieImage($destination, $postIndex = "imgBase64") {
if (empty($_POST[$postIndex])) {
return false;
}
$fileData = base64DataToImage($_POST[$postIndex]);
return file_put_contents($destination, $fileData);
}
function get_ffmpeg($ignoreGPU=false) {
function get_ffmpeg($ignoreGPU = false) {
global $global;
//return 'ffmpeg -user_agent "'.getSelfUserAgent("FFMPEG").'" ';
//return 'ffmpeg -headers "User-Agent: '.getSelfUserAgent("FFMPEG").'" ';

1
plugin/CustomizeAdvanced/CustomizeAdvanced.php
View file

@ -103,6 +103,7 @@ class CustomizeAdvanced extends PluginAbstract {
$obj->signInOnRight = true;
$obj->signInOnLeft = true;
$obj->forceCategory = false;
$obj->showCategoryTopImages = true;
$obj->autoPlayAjax = false;
$plugins = Plugin::getAllEnabled();

5
plugin/Gallery/view/BigVideo.php
View file

@ -144,7 +144,10 @@ if ($obj->BigVideo && empty($_GET['showOnly'])) {
</div>
<div class="<?php echo $colClass2; ?>">
<div class="<?php echo $colClass3; ?>">
<a class="h6 galleryLink" videos_id="<?php echo $videoRow['id']; ?>" href="<?php echo Video::getLink($videoRow['id'], $videoRow['clean_title'], false, $get); ?>" title="<?php echo $videoRow['title']; ?>">
<a class="h6 galleryLink" videos_id="<?php echo $videoRow['id']; ?>"
href="<?php echo Video::getLink($videoRow['id'], $videoRow['clean_title'], false, $get); ?>"
embed="<?php echo Video::getLink($videoRow['id'], $videoRow['clean_title'], true, $get); ?>"
title="<?php echo $videoRow['title']; ?>">
<h1><?php echo $videoRow['title']; ?></h1>
</a>
<div class="mainAreaDescriptionContainer">

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

@ -18,6 +18,7 @@ include $global['systemRootPath'] . 'plugin/Gallery/view/topLogic.php';
</div>
<div class="col-lg-10 col-lg-offset-1 list-group-item addWidthOnMenuOpen">
<?php
include $global['systemRootPath'] . 'view/include/categoryTop.php';
include $global['systemRootPath'] . 'plugin/Gallery/view/mainArea.php';
?>
</div>

4
plugin/Layout/Layout.php
View file

@ -145,9 +145,9 @@ class Layout extends PluginAbstract {
' - ' + state.text + '</span>'
);
return \$state;
};";
};</script>";
self::addFooterCode($code);
$code = '$(document).ready(function() {$(\'#'.$id.'\').select2({templateSelection: getIconsSelectformatStateResult, templateResult: getIconsSelectformatStateResult,width: \'100%\'});});</script>';
$code = '<script>$(document).ready(function() {$(\'#'.$id.'\').select2({templateSelection: getIconsSelectformatStateResult, templateResult: getIconsSelectformatStateResult,width: \'100%\'});});</script>';
self::addFooterCode($code);
return self::getSelectSearchable($icons, $name, $selected, $id, $class." iconSelect", true);
}

6
plugin/PlayLists/player.php
View file

@ -155,9 +155,9 @@ if (!empty($video['id'])) {
</div>
<?php } ?>
<a href="<?php echo $global["HTTP_REFERER"]; ?>" class="btn btn-outline btn-xs" style="position: absolute; top: 5px; right: 5px; display: none;" id="youtubeModeOnFullscreenCloseButton">
<i class="fas fa-times"></i>
</a>
<?php
include $global['systemRootPath'] . 'view/include/youtubeModeOnFullscreenCloseButton.php';
?>
</div>
</div>
<div class="col-sm-2 col-md-2"></div>

214
plugin/TopMenu/page/editor.php
View file

@ -24,7 +24,6 @@ $groups = UserGroups::getAllUsersGroups();
<link rel="stylesheet" type="text/css" href="<?php echo $global['webSiteRootURL']; ?>view/css/DataTables/datatables.min.css"/>
<link href="<?php echo $global['webSiteRootURL']; ?>js/Croppie/croppie.css" rel="stylesheet" type="text/css"/>
<link href="<?php echo $global['webSiteRootURL']; ?>js/bootstrap3-wysiwyg/bootstrap3-wysihtml5.min.css" rel="stylesheet" type="text/css"/>
<link href="<?php echo $global['webSiteRootURL']; ?>css/fontawesome-iconpicker/dist/css/fontawesome-iconpicker.min.css" rel="stylesheet" type="text/css"/>
<style>
#sortable li{
list-style: none;
@ -107,13 +106,9 @@ $groups = UserGroups::getAllUsersGroups();
<div class="col-md-6">
<div class="form-group">
<label>Icon:</label><br>
<div class="btn-group">
<button data-selected="graduation-cap" type="button" class="icp iconMenu btn btn-default btn-light dropdown-toggle iconpicker-component" data-toggle="dropdown">
<?php echo __("Select an icon for the menu"); ?> <i class="fa fa-fw"></i>
<span class="caret"></span>
</button>
<div class="dropdown-menu"></div>
</div>
<?php
echo Layout::getIconsSelect(__("Select an icon for the menu"), "", "menuIcon");
?>
</div>
</div>
@ -148,107 +143,105 @@ $groups = UserGroups::getAllUsersGroups();
<div id="menuItems" class="tab-pane fade" >
<div class="row">
<div class="col-md-8 showWhenHaveId" style="display: none;">
<div class="panel panel-default">
<div class="panel-heading">Menu Item Form</div>
<div class="panel-body">
<div>
<button class="btn btn-primary" id="btnNewMenuItem"><i class="fa fa-plus"></i> New Menu Item</button>
<button class="btn btn-success" id="btnSaveMenuItem"><i class="fa fa-save"></i> Save Menu Item</button>
</div>
<hr>
<div class="col-md-8 showWhenHaveId" style="display: none;">
<div class="panel panel-default">
<div class="panel-heading">Menu Item Form</div>
<div class="panel-body">
<div>
<button class="btn btn-primary" id="btnNewMenuItem"><i class="fa fa-plus"></i> New Menu Item</button>
<button class="btn btn-success" id="btnSaveMenuItem"><i class="fa fa-save"></i> Save Menu Item</button>
</div>
<hr>
<input type="hidden" class="form-control" id="menuItemId">
<div class="form-group">
<label for="title" >Title:</label>
<input type="text" class="form-control" id="title">
</div>
<div class="form-group">
<label for="menuSeoUrlItem">SEO friedly url:</label>
<?php echo $global['webSiteRootURL']; ?>menu/<input type="text" class="form-control" id="menuSeoUrlItem">
</div>
<div class="col-md-6">
<input type="hidden" class="form-control" id="menuItemId">
<div class="form-group">
<label for="item_order">Order:</label>
<select class="form-control" id="item_order">
<?php
for ($i = 0; $i < 30; $i++) {
?>
<option value="<?php echo $i; ?>"><?php echo $i; ?></option>
<label for="title" >Title:</label>
<input type="text" class="form-control" id="title">
</div>
<div class="form-group">
<label for="menuSeoUrlItem">SEO friedly url:</label>
<?php echo $global['webSiteRootURL']; ?>menu/<input type="text" class="form-control" id="menuSeoUrlItem">
</div>
<div class="col-md-6">
<div class="form-group">
<label for="item_order">Order:</label>
<select class="form-control" id="item_order">
<?php
}
?>
</select>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="item_status">Status:</label>
<select class="form-control" id="item_status">
<option value="active"><?php echo __('Active'); ?></option>
<option value="inactive"><?php echo __('Inactive'); ?></option>
</select>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="pageType">Type:</label>
<select class="form-control" id="pageType">
<option value="url"><?php echo __('URL'); ?></option>
<option value="urlIframe"><?php echo __('URL Iframe'); ?></option>
<option value="page"><?php echo __('Page'); ?></option>
</select>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>Icon:</label><br>
<div class="btn-group">
<button data-selected="graduation-cap" type="button" class="icp iconMenuItem btn btn-default btn-light dropdown-toggle iconpicker-component" data-toggle="dropdown">
<?php echo __("Select an icon for the menu"); ?> <i class="fa fa-fw"></i>
<span class="caret"></span>
</button>
<div class="dropdown-menu"></div>
</div>
</div>
</div>
<hr>
<div class="col-md-12">
<div id="divURL" class="divType" style="display: none;">
<div class="form-group">
<label for="url">URL:</label>
<input type="text" class="form-control" id="url">
</div>
</div>
<div id="divURLIframe" class="divType" style="display: none;">
<div class="form-group">
<label for="urlIframe">URL:</label>
<input type="text" class="form-control" id="urlIframe">
</div>
</div>
<div id="divText" class="divType" style="display: none;">
<div class="form-group">
<label for="text">text:</label>
<textarea type="text" class="form-control" id="text"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
for ($i = 0; $i < 30; $i++) {
?>
<div class="col-md-4 showWhenHaveId" style="display: none;">
<div class="panel panel-default">
<div class="panel-heading">Menu Items Order</div>
<div class="panel-body">
<div class="alert alert-warning">Drag and Drop Items to Sort</div>
<ul id="sortable">
</ul>
<option value="<?php echo $i; ?>"><?php echo $i; ?></option>
<?php
}
?>
</select>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="item_status">Status:</label>
<select class="form-control" id="item_status">
<option value="active"><?php echo __('Active'); ?></option>
<option value="inactive"><?php echo __('Inactive'); ?></option>
</select>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="pageType">Type:</label>
<select class="form-control" id="pageType">
<option value="url"><?php echo __('URL'); ?></option>
<option value="urlIframe"><?php echo __('URL Iframe'); ?></option>
<option value="page"><?php echo __('Page'); ?></option>
</select>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>Icon:</label><br>
<div>
<?php
echo Layout::getIconsSelect(__("Select an icon for the menu"), "", "menuItemIcon");
?>
</div>
</div>
</div>
<hr>
<div class="col-md-12">
<div id="divURL" class="divType" style="display: none;">
<div class="form-group">
<label for="url">URL:</label>
<input type="text" class="form-control" id="url">
</div>
</div>
<div id="divURLIframe" class="divType" style="display: none;">
<div class="form-group">
<label for="urlIframe">URL:</label>
<input type="text" class="form-control" id="urlIframe">
</div>
</div>
<div id="divText" class="divType" style="display: none;">
<div class="form-group">
<label for="text">text:</label>
<textarea type="text" class="form-control" id="text"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-4 showWhenHaveId" style="display: none;">
<div class="panel panel-default">
<div class="panel-heading">Menu Items Order</div>
<div class="panel-body">
<div class="alert alert-warning">Drag and Drop Items to Sort</div>
<ul id="sortable">
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@ -270,7 +263,6 @@ $groups = UserGroups::getAllUsersGroups();
<script type="text/javascript" src="<?php echo $global['webSiteRootURL']; ?>view/css/DataTables/datatables.min.js"></script>
<script src="<?php echo $global['webSiteRootURL']; ?>js/Croppie/croppie.min.js" type="text/javascript"></script>
<script src="<?php echo $global['webSiteRootURL']; ?>js/bootstrap3-wysiwyg/bootstrap3-wysihtml5.all.js" type="text/javascript"></script>
<script src="<?php echo $global['webSiteRootURL']; ?>css/fontawesome-iconpicker/dist/js/fontawesome-iconpicker.min.js" type="text/javascript"></script>
<script>
var currentItem = [];
@ -294,6 +286,8 @@ $groups = UserGroups::getAllUsersGroups();
$('#status').val("");
$('#type').val("");
$('#users_groups_id').val("");
$("#menuIcon").val("");
$("#menuIcon").trigger('change');
clearMenuItemForm();
checkIfHasId();
}
@ -309,6 +303,8 @@ $groups = UserGroups::getAllUsersGroups();
$('#item_status').val("");
$('#menuSeoUrlItem').val("");
$('iframe').contents().find('.wysihtml5-editor').html('');
$("#menuItemIcon").val("");
$("#menuItemIcon").trigger('change');
}
function startSortable() {
@ -415,7 +411,8 @@ $groups = UserGroups::getAllUsersGroups();
$('#item_status').val(item.status);
$('#text').val(item.text);
$('#menuSeoUrlItem').val(item.menuSeoUrlItem);
$(".iconMenuItem i").attr("class", item.icon);
$("#menuItemIcon").val(item.icon);
$("#menuItemIcon").trigger('change');
$('iframe').contents().find('.wysihtml5-editor').html(item.text);
if (item.url.length > 0) {
$('#pageType').val('url');
@ -454,8 +451,6 @@ $groups = UserGroups::getAllUsersGroups();
$('#pageType').trigger('change');
$('.iconMenu, .iconMenuItem').iconpicker({});
var table = $('#example').DataTable({
"ajax": "<?php echo $global['webSiteRootURL']; ?>plugin/TopMenu/menus.json.php",
"columns": [
@ -490,7 +485,8 @@ $groups = UserGroups::getAllUsersGroups();
$('#status').val(data.status);
$('#type').val(data.type);
$('#users_groups_id').val(data.users_groups_id);
$(".iconMenu i").attr("class", data.icon)
$("#menuIcon").val(data.icon);
$("#menuIcon").trigger('change');
checkIfHasId();
loadItems(data.id);
});
@ -510,7 +506,7 @@ $groups = UserGroups::getAllUsersGroups();
"status": $('#status').val(),
"type": $('#type').val(),
"users_groups_id": $('#users_groups_id').val(),
"icon": $(".iconMenu i").hasClass("iconpicker-component") ? "" : $(".iconMenu i").attr("class")
"icon": $("#menuIcon").val()
},
type: 'post',
success: function (response) {
@ -537,7 +533,7 @@ $groups = UserGroups::getAllUsersGroups();
"item_order": $('#item_order').val(),
"item_status": $('#item_status').val(),
"text": $('#pageType').val() == 'page' ? $('#text').val() : '',
"icon": $(".iconMenuItem i").hasClass("iconpicker-component") ? "" : $(".iconMenuItem i").attr("class")
"icon": $("#menuItemIcon").val()
},
type: 'post',
success: function (response) {

2
plugin/YouPHPFlix2/view/BigVideoButtons.php
View file

@ -6,7 +6,7 @@
<?php
if (!empty($video['trailer1'])) {
?>
<a href="#" class="btn btn-warning" onclick="flixFullScreen('<?php echo parseVideos($video['trailer1'], 1, 0, 0, 0, 1); ?>');return false;">
<a href="#" class="btn btn-warning" onclick="flixFullScreen('<?php echo parseVideos($video['trailer1'], 1, 0, 0, 0, 1); ?>', '');return false;">
<span class="fa fa-film"></span>
<span class=""><?php echo __("Trailer"); ?></span>
</a>

17
plugin/YouPHPFlix2/view/js/fullscreen.js
View file

@ -9,21 +9,21 @@ $(document).ready(function () {
});
function flixFullScreen(link) {
function flixFullScreen(link, url) {
$('body').addClass('fullScreen');
var divHTML = '<div id="divIframeFull" style="background-color:black; text-align: center; position: fixed; top: 0;left: 0; z-index: 9999;">';
divHTML += '<div id="divTopBar" style="position: fixed; top: 0; left: 0; height: 50px; width: 100vw; z-index: 99999; padding:10px; ">';
divHTML += '<span id="closeBtnFull" class="pull-right" onclick="closeFlixFullScreen();">';
divHTML += '<span id="closeBtnFull" class="pull-right" onclick="closeFlixFullScreen(\''+window.location.href+'\');">';
divHTML += '<i class="fa fa-times"></i></span></div></div>';
var div = $(divHTML).append('<iframe src="' + link + '" style="background-color:black; position: fixed; top: 0; left: 0; height: 100vh; width: 100vw; z-index: 9999; overflow: hidden;" frameBorder="0" id="iframeFull" allow="autoplay" allowfullscreen webkitallowfullscreen mozallowfullscreen oallowfullscreen msallowfullscreen>');
$('body').append(div);
$('body').addClass('fullscreen');
$("#divIframeFull").fadeIn();
window.history.pushState(null, null, url);
}
var closeFlixFullScreenTimout;
function closeFlixFullScreen() {
function closeFlixFullScreen(url) {
console.log("closeFlixFullScreen");
clearTimeout(closeFlixFullScreenTimout);
closeFlixFullScreenTimout = setTimeout(function () {
@ -43,6 +43,8 @@ function closeFlixFullScreen() {
}
console.log("closeFlixFullScreen removeClass");
$('body').removeClass('fullscreen');
window.history.pushState({},"", url);
}
function linksToFullscreen(selector) {
@ -53,12 +55,13 @@ function linksToFullscreen(selector) {
console.log("linksToFullscreen ");
event.preventDefault();
var link = $(this).attr('embed');
var href = $(this).attr('href');
if (!link) {
link = $(this).attr('href');
link = addGetParam(link, 'embed', 1);
link = addGetParam(href, 'embed', 1);
}
flixFullScreen(link);
flixFullScreen(link, href);
});
}
});
}

2
plugin/YouPHPFlix2/view/row.php
View file

@ -228,7 +228,7 @@ foreach ($videos as $value) {
<?php
if (!empty($value['trailer1'])) {
?>
<a href="#" class="btn btn-warning" onclick="flixFullScreen('<?php echo parseVideos($value['trailer1'], 1, 0, 0, 0, 1); ?>');return false;">
<a href="#" class="btn btn-warning" onclick="flixFullScreen('<?php echo parseVideos($value['trailer1'], 1, 0, 0, 0, 1); ?>', '');return false;">
<span class="fa fa-film"></span>
<span class="hidden-xs"><?php echo __("Trailer"); ?></span>
</a>

6
view/include/article.php
View file

@ -48,9 +48,9 @@ $sources = getVideosURLPDF($video['filename']);
}
?>
<a href="<?php echo $global["HTTP_REFERER"]; ?>" class="btn btn-outline btn-xs" style="position: absolute; top: 5px; right: 5px; display: none;" id="youtubeModeOnFullscreenCloseButton">
<i class="fas fa-times"></i>
</a>
<?php
include $global['systemRootPath'] . 'view/include/youtubeModeOnFullscreenCloseButton.php';
?>
</div>
</div>
<script>

6
view/include/audio.php
View file

@ -47,9 +47,9 @@ if ($video['type'] != "audio") {
?>
</audio>
<a href="<?php echo $global["HTTP_REFERER"]; ?>" class="btn btn-outline btn-xs" style="position: absolute; top: 5px; right: 5px; display: none;" id="youtubeModeOnFullscreenCloseButton">
<i class="fas fa-times"></i>
</a>
<?php
include $global['systemRootPath'] . 'view/include/youtubeModeOnFullscreenCloseButton.php';
?>
</div>
</div>
<script>

30
view/include/categoryTop.php Normal file
View file

@ -0,0 +1,30 @@
<?php
if(empty($advancedCustom->showCategoryTopImages)){
return false;
}
if (!empty($_GET['catName'])) {
$currentCat = Category::getCategoryByName($_GET['catName']);
$categories_id = $currentCat['id'];
if(!Category::isAssetsValids($categories_id)){
return false;
}
}else{
return false;
}
$photo = Category::getCategoryPhotoPath($categories_id);
$background = Category::getCategoryBackgroundPath($categories_id);
?>
<div class="row" style="position: relative; z-index: 1; margin-top: -15px;">
<img src="<?php echo $background['url']; ?>"
style="-webkit-mask-image: linear-gradient(to top, transparent 15%, black 85%);
mask-image: linear-gradient(to top, transparent 15%, black 85%);
width: 100%; margin-bottom: 10px;position: absolute; left: 0; top:0; z-index: -1;"
class="img img-responsive"/>
<img src="<?php echo $photo['url']; ?>" style="max-height: 15vw; z-index: 1; margin: 10px;"
class="img img-responsive img-thumbnail hidden-sm hidden-xs" />
<img src="<?php echo $photo['url']; ?>" style="max-height: 15vw; z-index: 1; margin: 5px;"
class="img img-responsive hidden-md hidden-lg" />
</div>

22
view/include/embed.php
View file

@ -1,4 +1,4 @@
<!-- embed -->
<!-- embed -->
<div class="row main-video" id="mvideo">
<div class="col-md-2 firstC"></div>
<div class="col-md-8 secC">
@ -36,13 +36,13 @@
if (((strpos($video['videoLink'], "youtu.be") == false) && (strpos($video['videoLink'], "youtube.com") == false) && (strpos($video['videoLink'], "vimeo.com") == false)) || ($disableYoutubeIntegration)) {
$_GET['isEmbedded'] = "e";
?>
<video playsinline webkit-playsinline="webkit-playsinline" id="mainVideo" style="display: none; height: 0;width: 0;" >
<?php
if (function_exists('getVTTTracks')) {
echo getVTTTracks($video['filename']);
}
?>
</video>
<video playsinline webkit-playsinline="webkit-playsinline" id="mainVideo" style="display: none; height: 0;width: 0;" >
<?php
if (function_exists('getVTTTracks')) {
echo getVTTTracks($video['filename']);
}
?>
</video>
<div id="main-video" class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" scrolling="no" allowfullscreen="true" src="<?php
echo parseVideos($video['videoLink']);
@ -112,9 +112,9 @@
}
?>
<a href="<?php echo $global["HTTP_REFERER"]; ?>" class="btn btn-outline btn-xs" style="position: absolute; top: 5px; right: 5px; display: none;" id="youtubeModeOnFullscreenCloseButton">
<i class="fas fa-times"></i>
</a>
<?php
include $global['systemRootPath'] . 'view/include/youtubeModeOnFullscreenCloseButton.php';
?>
</div>
</div>

6
view/include/serie.php
View file

@ -33,9 +33,9 @@ $isSerie = 1;
</div>
<a href="<?php echo $global["HTTP_REFERER"]; ?>" class="btn btn-outline btn-xs" style="position: absolute; top: 5px; right: 5px; display: none;" id="youtubeModeOnFullscreenCloseButton">
<i class="fas fa-times"></i>
</a>
<?php
include $global['systemRootPath'] . 'view/include/youtubeModeOnFullscreenCloseButton.php';
?>
</div>
</div>

6
view/include/video.php
View file

@ -71,9 +71,9 @@ $playerSkinsObj = AVideoPlugin::getObjectData("PlayerSkins");
</div>
<?php } ?>
<a href="<?php echo $global["HTTP_REFERER"]; ?>" class="btn btn-outline btn-xs" style="position: absolute; top: 5px; right: 5px; display: none;" id="youtubeModeOnFullscreenCloseButton">
<i class="fas fa-times"></i>
</a>
<?php
include $global['systemRootPath'] . 'view/include/youtubeModeOnFullscreenCloseButton.php';
?>
</div>
</div>
<div class="col-md-2"></div>

14
view/include/youtubeModeOnFullscreenCloseButton.php Normal file
View file

@ -0,0 +1,14 @@
<?php
if (isIframe()) {
return false;
}
$backURL = getBackURL();
if (empty($backURL)) {
return false;
}
?>
<div id="divTopBar" style="position: fixed; top: 0; left: 0; height: 50px; width: 100vw; z-index: 99999; padding:10px; ">
<a href="<?php echo $backURL; ?>" id="closeBtnFull" class="pull-right" >
<i class="fas fa-times"></i>
</a>
</div>

2
view/managerCategories_head.php
View file

@ -1,5 +1,3 @@
<?php
require_once $global['systemRootPath'] . 'objects/category.php';
?>
<script src="<?php echo $global['webSiteRootURL']; ?>view/css/fontawesome-iconpicker/dist/js/fontawesome-iconpicker.min.js" type="text/javascript"></script>
<link href="<?php echo $global['webSiteRootURL']; ?>view/css/fontawesome-iconpicker/dist/css/fontawesome-iconpicker.min.css" rel="stylesheet" type="text/css"/>

2
view/managerComments.php
View file

@ -18,8 +18,6 @@ require_once $global['systemRootPath'] . 'objects/comment.php';
<?php
include $global['systemRootPath'] . 'view/include/head.php';
?>
<script src="<?php echo $global['webSiteRootURL']; ?>view/css/fontawesome-iconpicker/dist/js/fontawesome-iconpicker.min.js" type="text/javascript"></script>
<link href="<?php echo $global['webSiteRootURL']; ?>view/css/fontawesome-iconpicker/dist/css/fontawesome-iconpicker.min.css" rel="stylesheet" type="text/css"/>
</head>
<body class="<?php echo $global['bodyClass']; ?>">

2
view/videoComments.php
View file

@ -233,7 +233,7 @@ if (User::canSeeCommentTextarea()) {
data: {'comment': comment, 'video': video, 'comments_id': comments_id, 'id': id},
success: function (response) {
if (response.status === "1") {
avideoAlert("<?php echo __("Congratulations"); ?>!", "<?php echo __("Your comment has been saved!"); ?>", "success");
avideoToast("<?php echo __("Your comment has been saved!"); ?>");
if (comments_id) {
if ($('.grid' + comments_id).hasClass('bootgrid-table')) {
$('.grid' + comments_id).bootgrid('reload');