From 42bb65a75da1adb88f07d01677e2b80ee6b59039 Mon Sep 17 00:00:00 2001 From: Heshan Wanigasooriya Date: Sat, 8 Jan 2011 05:44:36 +0000 Subject: Adding namespace to the video module variables --- includes/filesystem.inc | 6 +++--- includes/metadata.inc | 6 +++--- includes/transcoder.inc | 6 +++--- includes/video_helper.inc | 2 +- js/video.js | 12 ++++++------ plugins/video_s3/filesystem/video_s3.inc | 2 +- plugins/video_s3/video_s3.module | 2 +- plugins/video_zencoder/transcoders/video_zencoder.inc | 4 ++-- video.admin.inc | 10 +++++----- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/includes/filesystem.inc b/includes/filesystem.inc index 3041ee5..d7c71f9 100644 --- a/includes/filesystem.inc +++ b/includes/filesystem.inc @@ -14,7 +14,7 @@ class video_filesystem { public function __construct($filesystem = null) { //get our configured transcoder. if (!isset($filesystem)) - $filesystem = variable_get('vid_filesystem', 'drupal'); + $filesystem = variable_get('video_filesystem', 'drupal'); if (!module_load_include('inc', 'video', '/filesystem/' . $filesystem)) { $modules = module_list(); foreach ($modules as $module) { @@ -51,10 +51,10 @@ class video_filesystem { public function admin_settings() { $form = array(); $options = $this->_filesystem(); - $form['vid_filesystem'] = array( + $form['video_filesystem'] = array( '#type' => 'radios', '#title' => t('Video Filesystem'), - '#default_value' => variable_get('vid_filesystem', 'drupal'), + '#default_value' => variable_get('video_filesystem', 'drupal'), '#options' => $options['radios'], '#description' => t('!list', array('!list' => theme('item_list', $options['help']))), '#prefix' => '
', diff --git a/includes/metadata.inc b/includes/metadata.inc index 42f80b7..c2ad5c3 100644 --- a/includes/metadata.inc +++ b/includes/metadata.inc @@ -14,7 +14,7 @@ class video_metadata { public function __construct($metadata = null) { //get our configured transcoder. if (!isset($metadata)) - $metadata = variable_get('vid_metadata', 'flvtool2'); + $metadata = variable_get('video_metadata', 'flvtool2'); if (!module_load_include('inc', 'video', '/metadata/' . $metadata)) { $modules = module_list(); foreach ($modules as $module) { @@ -51,10 +51,10 @@ class video_metadata { '#description' => t('Metadata is particularly useful in video, where information about its contents (such as transcripts of conversations and text descriptions of its scenes) are not directly understandable by a computer, but where efficient search is desirable.'), ); $options = $this->_metadata(); - $form['vid_metadata'] = array( + $form['video_metadata'] = array( '#type' => 'radios', '#title' => t('Video Metadata'), - '#default_value' => variable_get('vid_metadata', 'flvtool2'), + '#default_value' => variable_get('video_metadata', 'flvtool2'), '#options' => $options['radios'], '#description' => t('!list', array('!list' => theme('item_list', $options['help']))), '#prefix' => '
', diff --git a/includes/transcoder.inc b/includes/transcoder.inc index c9d79b8..8d604a5 100644 --- a/includes/transcoder.inc +++ b/includes/transcoder.inc @@ -28,7 +28,7 @@ class video_transcoder { private function get_instance($transcoder = null) { //get our configured transcoder. if (!isset($transcoder)) - $transcoder = variable_get('vid_convertor', 'video_ffmpeg'); + $transcoder = variable_get('video_convertor', 'video_ffmpeg'); // module_load_include('inc', 'video', '/transcoders/' . $transcoder); if (!module_load_include('inc', 'video', '/transcoders/' . $transcoder)) { $modules = module_list(); @@ -85,10 +85,10 @@ class video_transcoder { public function admin_settings() { $form = array(); $options = $this->_transcoders(); - $form['vid_convertor'] = array( + $form['video_convertor'] = array( '#type' => 'radios', '#title' => t('Video transcoder'), - '#default_value' => variable_get('vid_convertor', 'video_ffmpeg'), + '#default_value' => variable_get('video_convertor', 'video_ffmpeg'), '#options' => $options['radios'], '#description' => t('Selecting a video transcoder will help you convert videos and generate thumbnails. !list', array('!list' => theme('item_list', $options['help']))), '#prefix' => '
', diff --git a/includes/video_helper.inc b/includes/video_helper.inc index 16598f9..63f3e5a 100644 --- a/includes/video_helper.inc +++ b/includes/video_helper.inc @@ -62,7 +62,7 @@ class video_helper { // Let othere module to load the video files by referance // Lets find out if we have pushed this file to the cdn if enabled. // @TODO : add correct filesystem load to this - $filesystem = variable_get('vid_filesystem', 'drupal'); + $filesystem = variable_get('video_filesystem', 'drupal'); if ($filesystem != 'drupal' && !module_exists('video_zencoder')) { module_load_include('inc', 'video', '/includes/filesystem'); $filesystem = new video_filesystem(); diff --git a/js/video.js b/js/video.js index 015724f..7610d24 100644 --- a/js/video.js +++ b/js/video.js @@ -13,19 +13,19 @@ $(document).ready(function() { } video_hide_all_options(); - $("input[name='vid_convertor']").change(function() { + $("input[name='video_convertor']").change(function() { video_hide_all_options(); }); // change metadata options video_hide_all__metadata_options(); - $("input[name='vid_metadata']").change(function() { + $("input[name='video_metadata']").change(function() { video_hide_all__metadata_options(); }); // change metadata options video_hide_all__filesystem_options(); - $("input[name='vid_filesystem']").change(function() { + $("input[name='video_filesystem']").change(function() { video_hide_all__filesystem_options(); }); @@ -80,7 +80,7 @@ $(document).ready(function() { }); function video_hide_all_options() { - $("input[name='vid_convertor']").each(function() { + $("input[name='video_convertor']").each(function() { var id = $(this).val(); $('#'+id).hide(); if ($(this).is(':checked')) { @@ -102,7 +102,7 @@ function videoftp_thumbnail_change() { } function video_hide_all__metadata_options() { - $("input[name='vid_metadata']").each(function() { + $("input[name='video_metadata']").each(function() { var id = $(this).val(); $('#'+id).hide(); if ($(this).is(':checked')) { @@ -112,7 +112,7 @@ function video_hide_all__metadata_options() { } function video_hide_all__filesystem_options() { - $("input[name='vid_filesystem']").each(function() { + $("input[name='video_filesystem']").each(function() { var id = $(this).val(); $('#'+id).hide(); if ($(this).is(':checked')) { diff --git a/plugins/video_s3/filesystem/video_s3.inc b/plugins/video_s3/filesystem/video_s3.inc index e103e1c..30f8033 100644 --- a/plugins/video_s3/filesystem/video_s3.inc +++ b/plugins/video_s3/filesystem/video_s3.inc @@ -104,7 +104,7 @@ class video_s3 extends video_filesystem { //lets show our buckets in table format with a delete link. //@todo add permissions //were enabled, that means they have successfully connected and created a bucket. - if (variable_get('amazon_s3_access_key', false) && variable_get('vid_filesystem', 'drupal') == 'video_s3') { + if (variable_get('amazon_s3_access_key', false) && variable_get('video_filesystem', 'drupal') == 'video_s3') { module_load_include('inc', 'video_s3', '/includes/amazon_s3'); $s3 = new video_amazon_s3; $s3->connect(); diff --git a/plugins/video_s3/video_s3.module b/plugins/video_s3/video_s3.module index 274da26..898a3eb 100644 --- a/plugins/video_s3/video_s3.module +++ b/plugins/video_s3/video_s3.module @@ -46,7 +46,7 @@ function video_s3_menu() { */ function video_s3_cron() { - $filesystem = variable_get('vid_filesystem', 'drupal'); + $filesystem = variable_get('video_filesystem', 'drupal'); if ($filesystem == 'video_s3') { module_load_include('inc', 'video_s3', '/includes/amazon_s3'); $s3 = new video_amazon_s3; diff --git a/plugins/video_zencoder/transcoders/video_zencoder.inc b/plugins/video_zencoder/transcoders/video_zencoder.inc index 0979d8f..db447ec 100644 --- a/plugins/video_zencoder/transcoders/video_zencoder.inc +++ b/plugins/video_zencoder/transcoders/video_zencoder.inc @@ -247,8 +247,8 @@ class video_zencoder implements transcoder_interface { */ public function admin_settings_validate($form, &$form_state) { $zencoder_api = isset($form_state['values']['video_zencoder_api_key']) ? $form_state['values']['video_zencoder_api_key'] : NULL; - if (isset($zencoder_api) && !empty($zencoder_api) || $form_state['values']['vid_convertor'] != 'video_zencoder') { - if (variable_get('vid_filesystem', 'drupal') != 'video_s3') { + if (isset($zencoder_api) && !empty($zencoder_api) || $form_state['values']['video_convertor'] != 'video_zencoder') { + if (variable_get('video_filesystem', 'drupal') != 'video_s3') { form_set_error('video_zencoder', t('You must enable the Amazon S3 as !link.', array('!link' => l(t('FileSystem'), 'admin/settings/video/filesystem')))); } return; diff --git a/video.admin.inc b/video.admin.inc index e97061f..3eb33d3 100644 --- a/video.admin.inc +++ b/video.admin.inc @@ -23,12 +23,12 @@ function video_transcoder_admin_settings() { */ function video_transcoder_admin_settings_validate($form, &$form_state) { // check ffmpeg_wrapper module installed or not - if ($form_state['values']['vid_convertor'] == 'video_ffmpeg_wrapper' && !module_exists('ffmpeg_wrapper')) { - form_set_error('vid_convertor', t('You need to download and install the !ffmpeg_wrapper module to enable this option.', array('!ffmpeg_wrapper' => l(t('FFMPEG Wrapper'), 'http://drupal.org/project/ffmpeg_wrapper')))); + if ($form_state['values']['video_convertor'] == 'video_ffmpeg_wrapper' && !module_exists('ffmpeg_wrapper')) { + form_set_error('video_convertor', t('You need to download and install the !ffmpeg_wrapper module to enable this option.', array('!ffmpeg_wrapper' => l(t('FFMPEG Wrapper'), 'http://drupal.org/project/ffmpeg_wrapper')))); } // add vallidations by trnacoder interface - $transcoder = $form_state['values']['vid_convertor']; + $transcoder = $form_state['values']['video_convertor']; module_load_include('inc', 'video', '/includes/transcoder'); $transcoder = new video_transcoder($transcoder); $transcoder->admin_settings_validate($form, $form_state); @@ -136,7 +136,7 @@ function video_metadata_admin_settings() { function video_metadata_admin_settings_validate($form, &$form_state) { // add vallidations by metadata interface - $metadata = $form_state['values']['vid_metadata']; + $metadata = $form_state['values']['video_metadata']; module_load_include('inc', 'video', '/includes/metadata'); $metadata = new video_metadata($metadata); $metadata->admin_settings_validate($form, $form_state); @@ -176,7 +176,7 @@ function video_filesystem_admin_settings() { function video_filesystem_admin_settings_validate($form, &$form_state) { // add vallidations by metadata interface - $filesystem = $form_state['values']['vid_filesystem']; + $filesystem = $form_state['values']['video_filesystem']; module_load_include('inc', 'video', '/includes/filesystem'); $filesystem = new video_filesystem($filesystem); $filesystem->admin_settings_validate($form, $form_state); -- cgit v1.2.3