From d2c9046205bd5c9a61ffe1792470defbfa0250ce Mon Sep 17 00:00:00 2001 From: Fabio Varesano Date: Mon, 8 Jan 2007 00:45:03 +0000 Subject: * added escaping to filename in ffmpeg_helper which caused filenames with spaces not to work * fixed some incorrect usage of boolean operators * fixed some node links --- plugins/video_ffmpeg_helper/video_ffmpeg_helper.module | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/video_ffmpeg_helper/video_ffmpeg_helper.module b/plugins/video_ffmpeg_helper/video_ffmpeg_helper.module index 176979a..96e16dc 100644 --- a/plugins/video_ffmpeg_helper/video_ffmpeg_helper.module +++ b/plugins/video_ffmpeg_helper/video_ffmpeg_helper.module @@ -203,10 +203,12 @@ function video_ffmpeg_helper_nodeapi(&$node, $op, $teaser) { function _video_ffmpeg_helper_get_video_info(&$node) { + // escape file name for safety + $file = escapeshellarg($_SESSION['video_upload_file']->filepath); // create the full command to execute - $command = variable_get('video_ffmpeg_helper_ffmpeg_path', '/usr/bin/ffmpeg') . ' -i ' . $_SESSION['video_upload_file']->filepath; + $command = variable_get('video_ffmpeg_helper_ffmpeg_path', '/usr/bin/ffmpeg') . ' -i ' . $file; - print $command; + drupal_set_message('executing' . $command); //execute the command ob_start(); -- cgit v1.2.3