vanzhiganov/clipbucket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

commitimg player updaed settings for cb htm5player settings plugin

Browse source
This commit is contained in:
Fahad Abbas 2015-07-02 13:04:16 +00:00
parent 2344cfa771
commit 923de649c9
8 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
upload/actions/video_convert.php
View file

@ -122,7 +122,9 @@ if($orig_file1)
if(PHP_OS == "Linux")
{
$ffMpegPath = FFMPEG_BINARY;
file_put_contents('test.txt', $ffMpegPath." -i ".$orig_file1." -acodec copy -vcodec copy -y -f null /dev/null 2>&1");
$out = shell_exec($ffMpegPath." -i ".$orig_file1." -acodec copy -vcodec copy -y -f null /dev/null 2>&1");
sleep(1);
$log->writeLog();

4
upload/cb_install/sql/configs.sql
View file

@ -255,3 +255,7 @@ INSERT INTO `{tbl_prefix}config` (`configid`, `name`, `value`) VALUES (NULL, 'fa
INSERT INTO `{tbl_prefix}config` (`configid`, `name`, `value`) VALUES (NULL, 'seo_vido_url', '1');
INSERT INTO `{tbl_prefix}config` (`configid`, `name`, `value`) VALUES (NULL, 'use_cached_pagin', 'yes'),
(NULL, 'cached_pagin_time', '5');
-- Addition for 2.7.4
INSERT INTO `{tbl_prefix}config` (`configid`, `name`, `value`) VALUES (NULL, 'player_logo_url', 'http://clip-bucket.com/');

2
upload/cb_install/sql/upgrade_2.7.4.sql Executable file
View file

@ -0,0 +1,2 @@
-- Addition for 2.7.4
INSERT INTO `{tbl_prefix}config` (`configid`, `name`, `value`) VALUES (NULL, 'player_logo_url', 'http://clip-bucket.com/');

1
upload/includes/functions_player.php
View file

@ -26,6 +26,7 @@ function flashPlayer($param)
$param['height'] = $height;
$param['width'] = $width ;
$param['enlarge_button'] = config('enlarge_button');
$param['player_logo_url'] = config('player_logo_url');
//dump($code);
if(!$param['autoplay'])

2
upload/player/CB_html5_player/html5_player.html
View file

@ -191,7 +191,7 @@ var webpath="{$display}";var homepath="{$about}";var web="{$ov}";var $top="{$top
var $left="{$left}";var $bottom="{$bottom}";var $right="{$right}";var key ="{$key}" ;
var nor_vid = "{$normal_vid_file}"; var hq_vid = "{$hq_vid_file}";
var enlarge_small = "{$enlarge_small}"; var autoplay = "{$autoplay}";
var iv_logo_enable = "{$iv_logo_enbale}";
var iv_logo_enable = "{$iv_logo_enbale}";var product_link = "{$product_link}";
//For multiserver, video files to html5_player.js (Json)
if('{$json_videos}')
var files = '{$json_videos}';

4
upload/player/CB_html5_player/html5_player.js
View file

@ -558,7 +558,7 @@ alert(document.URL);
//Logo
$('.cb-playerLogo').append('<div id="path" class="path hbtn" > </div>');
$('#path').prop("href","http://clip-bucket.com/");
$('#path').prop("href",product_link);
// $("#path").insertAfter("#hd");
$('#path').css({
'backgroundImage': 'url(data:image/png;base64,' + webpath + ')',
@ -571,7 +571,7 @@ $('#path').css({
});
$("#path").click(function(event) {
window.open('http://clip-bucket.com/', '_blank');
window.open(product_link, '_blank');
});

6
upload/player/CB_html5_player/html5_player.php
View file

@ -66,6 +66,12 @@ if(!function_exists('html5_player'))
if($in['autoplay'] =='yes')
assign('autoplay','true');
if ($in['player_logo_url'])
{
$player_logo_url = $in['player_logo_url'];
assign('product_link',$player_logo_url);
}
assign('vdata',$vdetails);
assign('height',$in['height']);

2
upload/styles/global/upload_form.html
View file

@ -8,7 +8,7 @@
<div class="dragDropContainer" id="dragDrop">
<span class="upload-logo"></span>
<strong class="block-title">Drag &amp; Drop Files Here</strong>
<p>Video can be 1000 MB in size, 120 Min in Duration and Any common format You can also upload HD videos</p>
<p>Video can be 1000 MB in size, 120 Min in Duration and of any common format You can also upload HD videos</p>
</div>
<div class="selectButtonContainer">
<a id="selectFiles" href="javascript:;" class="btn btn-primary btn-lg selectFiles">Select Videos</a>