diff options
| -rw-r--r-- | plugins/video_ffmpeg_helper/README.txt | 0 | ||||
| -rw-r--r-- | plugins/video_ffmpeg_helper/video_render.php | 3 | ||||
| -rw-r--r-- | plugins/video_image/video_image.module | 8 |
3 files changed, 9 insertions, 2 deletions
diff --git a/plugins/video_ffmpeg_helper/README.txt b/plugins/video_ffmpeg_helper/README.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/plugins/video_ffmpeg_helper/README.txt diff --git a/plugins/video_ffmpeg_helper/video_render.php b/plugins/video_ffmpeg_helper/video_render.php index 99b0f4b..fddaedd 100644 --- a/plugins/video_ffmpeg_helper/video_render.php +++ b/plugins/video_ffmpeg_helper/video_render.php @@ -119,6 +119,9 @@ function video_render_main() { db_query('UPDATE {video} SET vidfile = "%s", videox = %d, videoy = %d WHERE nid=%d AND vid=%d', "", $job->calculatedx, $job->calculatedy, $job->nid, $job->vid); _video_render_job_change_status($job->nid, $job->vid, VIDEO_RENDERING_COMPLETE); + + // delete the vile + unlink($job->convfile); } else { watchdog('video_scheduler', t('error moving video to the final directory. Check folder permissions.'), WATCHDOG_ERROR); diff --git a/plugins/video_image/video_image.module b/plugins/video_image/video_image.module index 4c134eb..850781a 100644 --- a/plugins/video_image/video_image.module +++ b/plugins/video_image/video_image.module @@ -109,8 +109,8 @@ function video_image_nodeapi(&$node, $op, $teaser) { $image->name = $node->name; $image->created = $node->created; $image->type = 'image'; - $image->status = _video_image_publish_thumbnails(); - $image->promote = _video_image_promote_thumbnails(); + //$image->status = _video_image_publish_thumbnails(); + //$image->promote = _video_image_promote_thumbnails(); if (!$field_name && module_exists('video_ffmpeg_helper') && variable_get('video_ffmpeg_helper_auto_thumbnail', false)) { $image->title = $_SESSION['video_upload_file']->filename; $field_name = _video_ffmpeg_helper_auto_thumbnail($node); @@ -125,6 +125,10 @@ function video_image_nodeapi(&$node, $op, $teaser) { if (!form_get_errors()) { $image = node_submit($image); node_save($image); + + // needed to set the correct status and promote values if the user does not have enought permissions. Is there a better solution??? + db_query('UPDATE {node} SET status = %d, promote = %d WHERE nid = %d AND vid = %d', _video_image_publish_thumbnails(), _video_image_promote_thumbnails(), $image->nid, $image->vid); + $node->iid = $node->serial_data['iid'] = $image->nid; $_SESSION['video_upload_file']->iid = $image->nid; $node->new_image = TRUE; |