diff --git a/plugins/video.inc b/plugins/video.inc
index 4038e43..fe912ab 100644
--- a/plugins/video.inc
+++ b/plugins/video.inc
@@ -16,9 +16,9 @@ fbsmp_include_library('ffmpeg.inc', 'ffmpeg');
* Implementation of hook_fbsmp_admin_settings_form().
*/
function fbsmp_video_fbsmp_admin_settings_form(&$form_state) {
- if (!module_exists('swftools')) {
+ if (!module_exists('flowplayer')) {
drupal_set_message(
- t('You must install SWFTools module to display the FLV or F4V videos.', array('!swftools' => 'http://drupal.org/project/swftools')),
+ t('You must install Flow Player module to display the FLV or F4V videos.', array('!flowplayer' => 'http://drupal.org/project/flowplayer')),
'error'
);
}
@@ -274,7 +274,7 @@ function fbsmp_video_fbsmp_admin_settings_form_validate(&$form, &$form_state) {
//Do not allow the file path to be the same as the file_directory_path().
//This causes all sorts of problems with things like file_create_url().
foreach (array('file_path', 'thumbnails_path') as $var) {
- if (strpos($form_values[$var], file_directory_path()) === 0) {
+ if (strpos($form_values[$var], file_default_scheme() . ':/') === 0) {
form_set_error($var, t('The file path (@file_path) cannot start with the system files directory (@files_directory), as this may cause conflicts when building file URLs.', array('@file_path' => $form_values[$var], '@files_directory' => file_directory_path())));
}
}
@@ -523,7 +523,12 @@ function fbsmp_video_fbsmp_delete($status) {
$attachment_data = $status->attachment->data;
_fbsmp_file_delete(_fbsmp_file_load($attachment_data['fid']));
- $video = db_fetch_object(db_query("SELECT fv.* FROM {fbsmp_videos} fv WHERE fid = :fid", array(':fid' => $attachment_data['fid'])));
+ $video = db_select('fbsmp_videos' , 'fv')
+ ->fields('fv')
+ ->condition('fid', $attachment->data['fid'])
+ ->execute()
+ ->fetchObject();
+
if ($video) {
_fbsmp_file_delete(_fbsmp_file_load($video->cid));
}
@@ -745,8 +750,8 @@ function fbsmp_video_widget_upload_validators($settings) {
}
$validators = array(
- '_fbsmp_file_validate_size' => array($max_filesize),
- '_fbsmp_file_validate_extensions' => array($settings['file_extensions'])
+ 'file_validate_size' => array($max_filesize),
+ 'file_validate_extensions' => array($settings['file_extensions'])
);
return $validators;
@@ -794,8 +799,8 @@ function fbsmp_video_fbsmp_themed_attachment($attachment) {
$thumbnail_url = file_create_url($thumbnail_file['filepath']);
}
}
- // TODO Please change this theme call to use an associative array for the $variables parameter.
- return theme('fbsmp_video_attachment', $file, $thumbnail_url, $attachment_data['title'], $attachment_data['description'], $settings);
+
+ return theme('fbsmp_video_attachment', array('file' => $file, 'thumbnail_url' => $thumbnail_url, 'settings' => $settings));
}
return '';
}
@@ -814,14 +819,19 @@ function fbsmp_video_fbsmp_themed_attachment($attachment) {
* An array containing the file information including the video download url.
*/
function fbsmp_video_load_displayed_video($attachment, $settings = array()) {
- $query = "SELECT fv.* from {fbsmp_videos} as fv WHERE fid = %d";
- $fv_object = db_fetch_object(db_query("SELECT fv.* from {fbsmp_videos} as fv WHERE fid = :fid", array(':fid' => $attachment->data['fid'])));
+
+ $fv_object = db_select('fbsmp_videos' , 'fv')
+ ->fields('fv')
+ ->condition('fid', $attachment->data['fid'])
+ ->execute()
+ ->fetchObject();
+
if ($fv_object) {
$cid = ($fv_object->status == FBSMP_VIDEO_CONVERSION_NONE || ($fv_object->status != FBSMP_VIDEO_CONVERSION_COMPLETE && $settings['show_original_video'])) ? $fv_object->fid : ($fv_object->status == FBSMP_VIDEO_CONVERSION_COMPLETE ? $fv_object->cid : 0);
$file = (array) _fbsmp_file_load($cid);
- if (is_file($file['filepath'])) {
- $file['url'] = file_create_url($file['filepath']);
+ if (is_file($file['uri'])) {
+ $file['url'] = file_create_url($file['uri']);
}
else {
$file = array();
@@ -850,17 +860,22 @@ function fbsmp_video_load_displayed_video($attachment, $settings = array()) {
* @return
* HTML code which can be embedded into the status.
*/
-function theme_fbsmp_video_attachment($file, $thumbnail_url = '', $title = '', $description = '', $settings = array()) {
+function theme_fbsmp_video_attachment($variables) {
// TODO: Should this theme fbsmp_video_attachment be declared in hook_theme()?
$output = '';
+ $file = $variables['file'];
+ $settings = $variables['settings'];
+ $thumbnail_url = $variables['thumbnail_url'];
+
if (!empty($file)) {
$video_extension = pathinfo($file['filename'], PATHINFO_EXTENSION);
$extensions = fbsmp_video_web_video_extensions();
+
if (key_exists($video_extension, $extensions)) {
$settings['player_width'] = !empty($settings['player_width']) ? $settings['player_width'] : 435;
$settings['player_height'] = !empty($settings['player_height']) ? $settings['player_height'] : 350;
// TODO Please change this theme call to use an associative array for the $variables parameter.
- $output .= theme($extensions[$video_extension], $file['url'], $thumbnail_url, $settings);
+ $output .= theme($extensions[$video_extension], array('video_url' => $file['url'], 'thumbnail_url' => $thumbnail_url, 'settings' => $settings));
}
}
@@ -919,7 +934,7 @@ function fbsmp_video_fbsmp_subtheme() {
}
$themes['fbsmp_video_attachment'] = array(
- 'arguments' => array('file' => NULL, 'thumbnail_url' => NULL, 'title' => NULL, 'description' => NULL, 'settings' => NULL),
+ 'arguments' => array('file' => NULL, 'thumbnail_url' => NULL, 'settings' => NULL),
'file' => 'plugins/video.inc',
);
return $themes;
@@ -929,7 +944,12 @@ function fbsmp_video_fbsmp_subtheme() {
* @todo Please document this function.
* @see http://drupal.org/node/1354
*/
-function theme_fbsmp_video_play_quicktime($video_url, $thumbnail_url = '', $settings = array()) {
+function theme_fbsmp_video_play_quicktime($variables) {
+
+ $video_url = $variables['video_url'];
+ $thumbnail_url = $variables['thumbnail_url'];
+ $settings = $variables['settings'];
+
// TODO: Should this theme fbsmp_video_play_quicktime be declared in hook_theme()?
$autoplay = $settings['autoplay'] ? 'true' : 'false';
@@ -957,7 +977,12 @@ function theme_fbsmp_video_play_quicktime($video_url, $thumbnail_url = '', $sett
* @todo Please document this function.
* @see http://drupal.org/node/1354
*/
-function theme_fbsmp_video_play_divx($video_url, $thumbnail_url = '', $settings = array()) {
+function theme_fbsmp_video_play_divx($variables) {
+ // @todo to change this something neat
+ $video_url = $variables['video_url'];
+ $thumbnail_url = $variables['thumbnail_url'];
+ $settings = $variables['settings'];
+
// TODO: Should this theme fbsmp_video_play_divx be declared in hook_theme()?
$output = '';
$output .= '