aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglen201 <glen201@527446.no-reply.drupal.org>2009-07-26 06:59:02 +0000
committerglen201 <glen201@527446.no-reply.drupal.org>2009-07-26 06:59:02 +0000
commit2524eecbeef2c8b3c0d80a5ffcde2604da50e30c (patch)
tree5012f3d2be293e9228e74951ace174471c528c8e
parentd5ec1b7c852aa808ce71ae793449d52fa03bfa39 (diff)
downloadvideo-2524eecbeef2c8b3c0d80a5ffcde2604da50e30c.tar.gz
video-2524eecbeef2c8b3c0d80a5ffcde2604da50e30c.tar.bz2
Fixed hardcoded video types in Upload module ignored settings for non-admin users
Updated instructions INSTALL.TXT for ffmpeg upgrade cron php files
-rw-r--r--INSTALL.txt4
-rw-r--r--types/video_upload/video_upload.module6
2 files changed, 8 insertions, 2 deletions
diff --git a/INSTALL.txt b/INSTALL.txt
index 1715120..5f478a1 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -22,6 +22,10 @@ INSTALL INSTRUCTIONS FOR VIDEO.MODULE
* If you are upgrading from a previous version of the video module,
go to admin -> modules and choose "Save". This will flush the
views cache to ensure you can see the views.
+ * If you previously configured the video ffmpeg helper sub-module,
+ re-copy and re-edit the video_render.php and video_scheduler.php from
+ the folder modules/video/plugins/video_ffmpeg_helper to the root
+ of your web site.
* Go to admin -> views. You will see a default view supplied for
video. You can also create a new one by choosing "Add." In the
"Fields" section, you should see selections for "Video: (node info)".
diff --git a/types/video_upload/video_upload.module b/types/video_upload/video_upload.module
index 390a52b..5ad1a83 100644
--- a/types/video_upload/video_upload.module
+++ b/types/video_upload/video_upload.module
@@ -401,7 +401,7 @@ function _video_upload_presave(&$node) {
}
// get extention array
- $extentions = explode(",",variable_get('video_upload_allowed_extensions', 'mov,flv,wmv'));
+ $extensions = explode(",",variable_get('video_upload_allowed_extensions', 'mov,flv,wmv'));
$validators = array(
'file_validate_extensions' => array( 'csv' ),
@@ -409,7 +409,9 @@ function _video_upload_presave(&$node) {
// TODO : add file size validation
// 'file_validate_size' => array($limits['file_size'], $limits['user_size']),
- if (count($_POST) && $file = file_save_upload($file_field , array('file_validate_extensions' => array('mov flv wmv')))) { // a file has been uploaded
+
+ //GMM: Fix hard-coded allowed extensions
+ if (count($_POST) && $file = file_save_upload($file_field , array('file_validate_extensions' => array(implode(" ",$extensions))))) { // a file has been uploaded
$node->new_video_upload_file = $file;
$node->new_video_upload_file_fid = $file->fid;
//print_r($file);