mirror of
https://github.com/DanielnetoDotCom/YouPHPTube
synced 2025-10-03 09:49:28 +02:00
update
This commit is contained in:
parent
cd16edb27a
commit
78f76feaf0
6 changed files with 29 additions and 5 deletions
|
@ -5521,7 +5521,7 @@ function isHLS() {
|
||||||
global $video, $global;
|
global $video, $global;
|
||||||
if (isLive()) {
|
if (isLive()) {
|
||||||
return true;
|
return true;
|
||||||
} elseif (!empty($video) && $video['type'] == 'video' && file_exists(Video::getPathToFile("{$video['filename']}/index.m3u8"))) {
|
} elseif (!empty($video) && is_array($video) && $video['type'] == 'video' && file_exists(Video::getPathToFile("{$video['filename']}/index.m3u8"))) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -28,7 +28,7 @@ class MonetizeUsers extends PluginAbstract {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPluginVersion() {
|
public function getPluginVersion() {
|
||||||
return "1.0";
|
return "2.0";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getEmptyDataObject() {
|
public function getEmptyDataObject() {
|
||||||
|
@ -86,6 +86,7 @@ class MonetizeUsers extends PluginAbstract {
|
||||||
$percentage_watched = $obj->rewardMinimumViewPercentage->value;
|
$percentage_watched = $obj->rewardMinimumViewPercentage->value;
|
||||||
$now = date('Y-m-d H:i:s');
|
$now = date('Y-m-d H:i:s');
|
||||||
$when_from = date('Y-m-d H:i:s', Monetize_user_reward_log::getLastRewardTime());
|
$when_from = date('Y-m-d H:i:s', Monetize_user_reward_log::getLastRewardTime());
|
||||||
|
_error_log("MonetizeUsers getLastRewardTime {$when_from}");
|
||||||
//$when_from = date('Y-m-d H:i:s', strtotime('-1 year'));
|
//$when_from = date('Y-m-d H:i:s', strtotime('-1 year'));
|
||||||
$only_logged_users = $obj->rewardOnlyLoggedUsersView;
|
$only_logged_users = $obj->rewardOnlyLoggedUsersView;
|
||||||
$users_id = 0;
|
$users_id = 0;
|
||||||
|
@ -219,4 +220,16 @@ class MonetizeUsers extends PluginAbstract {
|
||||||
return $fullData;
|
return $fullData;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function updateScript() {
|
||||||
|
global $global;
|
||||||
|
|
||||||
|
if (AVideoPlugin::compareVersion($this->getName(), "2.0") < 0) {
|
||||||
|
$sqls = file_get_contents($global['systemRootPath'] . 'plugin/MonetizeUsers/install/updateV2.0.sql');
|
||||||
|
$sqlParts = explode(";", $sqls);
|
||||||
|
foreach ($sqlParts as $value) {
|
||||||
|
sqlDal::writeSql(trim($value));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,12 +81,13 @@ class Monetize_user_reward_log extends ObjectYPT {
|
||||||
|
|
||||||
static function getLastRewardTime(){
|
static function getLastRewardTime(){
|
||||||
global $global;
|
global $global;
|
||||||
$sql = "SELECT MAX(created) as created FROM monetize_user_reward_log";
|
$sql = "SELECT MAX(created_php_time) as created_php_time FROM monetize_user_reward_log";
|
||||||
$res = sqlDAL::readSql($sql, '', [], true);
|
$res = sqlDAL::readSql($sql, '', [], true);
|
||||||
$data = sqlDAL::fetchAssoc($res);
|
$data = sqlDAL::fetchAssoc($res);
|
||||||
sqlDAL::close($res);
|
sqlDAL::close($res);
|
||||||
if ($res && !empty($data['created'])) {
|
if ($res && !empty($data['created'])) {
|
||||||
return strtotime($data['created']);
|
_error_log("MonetizeUsers getLastRewardTime {$when_from}");
|
||||||
|
return $data['created_php_time'];
|
||||||
} else {
|
} else {
|
||||||
return strtotime('-24 hours');
|
return strtotime('-24 hours');
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,10 +10,12 @@ CREATE TABLE IF NOT EXISTS `monetize_user_reward_log` (
|
||||||
`created` DATETIME NULL,
|
`created` DATETIME NULL,
|
||||||
`modified` DATETIME NULL,
|
`modified` DATETIME NULL,
|
||||||
`timezone` VARCHAR(255) NULL,
|
`timezone` VARCHAR(255) NULL,
|
||||||
|
`created_php_time` INT(11) NULL,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
INDEX `fk_monetize_user_reward_log_videos1_idx` (`videos_id` ASC) ,
|
INDEX `fk_monetize_user_reward_log_videos1_idx` (`videos_id` ASC) ,
|
||||||
INDEX `monetize_user_reward_log_idx1` (`video_owner_users_id` ASC) ,
|
INDEX `monetize_user_reward_log_idx1` (`video_owner_users_id` ASC) ,
|
||||||
INDEX `monetize_user_reward_log_idx2` (`when_watched` ASC) ,
|
INDEX `monetize_user_reward_log_idx2` (`when_watched` ASC) ,
|
||||||
|
INDEX `monetize_user_reward_log_created_php_time` (`created_php_time` ASC),
|
||||||
CONSTRAINT `fk_monetize_user_reward_log_videos1`
|
CONSTRAINT `fk_monetize_user_reward_log_videos1`
|
||||||
FOREIGN KEY (`videos_id`)
|
FOREIGN KEY (`videos_id`)
|
||||||
REFERENCES `videos` (`id`)
|
REFERENCES `videos` (`id`)
|
||||||
|
|
3
plugin/MonetizeUsers/install/updateV2.0.sql
Normal file
3
plugin/MonetizeUsers/install/updateV2.0.sql
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
ALTER TABLE `monetize_user_reward_log`
|
||||||
|
ADD COLUMN `created_php_time` INT(11) NULL,
|
||||||
|
ADD INDEX `monetize_user_reward_log_created_php_time` (`created_php_time` ASC);
|
|
@ -308,7 +308,12 @@ class PlayerSkins extends PluginAbstract {
|
||||||
global $global, $config, $getStartPlayerJSWasRequested, $video, $url, $title;
|
global $global, $config, $getStartPlayerJSWasRequested, $video, $url, $title;
|
||||||
$js = "<!-- playerSkin -->";
|
$js = "<!-- playerSkin -->";
|
||||||
$obj = $this->getDataObject();
|
$obj = $this->getDataObject();
|
||||||
if (!empty($_GET['videoName']) || !empty($_GET['u']) || !empty($_GET['evideo']) || !empty($_GET['playlists_id']) || !empty($video['id'])) {
|
if (
|
||||||
|
!empty($_GET['videoName']) ||
|
||||||
|
!empty($_GET['u']) ||
|
||||||
|
!empty($_GET['evideo']) ||
|
||||||
|
!empty($_GET['playlists_id']) ||
|
||||||
|
(is_array($video) && !empty($video['id']))) {
|
||||||
if (empty($obj->showLoopButton) && empty($obj->contextMenuLoop)) {
|
if (empty($obj->showLoopButton) && empty($obj->contextMenuLoop)) {
|
||||||
$js .= "<script>setPlayerLoop(false);</script>";
|
$js .= "<script>setPlayerLoop(false);</script>";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue