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

Fixed remote uploading issue

Browse source
This commit is contained in:
Saqib Razzaq 2016-03-24 16:49:10 +05:00
parent 242cf2a543
commit 1b2524c42d
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
upload/actions/file_downloader.php
View file

@ -356,15 +356,15 @@ $vidDetails = array
$vid = $Upload->submit_upload($vidDetails);
echo json_encode(array('vid'=>$vid));
$file_dir = $vidDetails['file_directory'];
$logFile = LOGS_DIR.'/'.$file_dir.'/'.$file_name.".log";
if($quick_conv=='yes' || $use_crons=='no')
{
//exec(php_path()." -q ".BASEDIR."/actions/video_convert.php &> /dev/null &");
if (stristr(PHP_OS, 'WIN')) {
exec(php_path()." -q ".BASEDIR."/actions/video_convert.php $targetFileName sleep");
} else {
exec(php_path()." -q ".BASEDIR."/actions/video_convert.php $targetFileName sleep&> /dev/null &");
exec(php_path()." -q ".BASEDIR."/actions/video_convert.php $targetFileName $file_name $file_dir $logFile > /dev/null &");
}
}

2
upload/actions/file_uploader.php
View file

@ -238,6 +238,8 @@ switch($mode)
{
$Upload->validate_video_upload_form();
$_POST['videoid'] = trim($_POST['videoid']);
$_POST['title'] = addslashes($_POST['title']);
$_POST['description'] = addslashes($_POST['description']);
if(empty($eh->error_list))
{
$cbvid->update_video();

4
upload/actions/video_convert.php
View file

@ -26,7 +26,7 @@
$log = new SLog($logFile);
$log->newSection("Starting Conversion Log");
$TempLogData = "Filename : {$_filename}\n";
$TempLogData = "Filename : {$fileName}\n";
$TempLogData .= "File directory : {$file_directory_}\n";
$TempLogData .= "Log file : {$logFile}\n";
$log->writeLine("Getting Arguments",$TempLogData, true, true);
@ -127,7 +127,7 @@
$ffmpeg->configs = $configs;
$ffmpeg->file_name = $tmp_file;
$ffmpeg->filetune_directory = $file_directory;
$ffmpeg->raw_path = VIDEOS_DIR.'/'.$file_directory.$_filename;
$ffmpeg->raw_path = VIDEOS_DIR.'/'.$file_directory.$fileName;
//$ffmpeg->logs = $log;