diff -urpw op_video/actions.inc /home/jonny/Desktop/op_video/actions.inc
--- op_video/actions.inc 2008-04-06 23:06:40.000000000 +0100
+++ /home/jonny/Desktop/op_video/actions.inc 2008-07-19 21:41:36.000000000 +0100
@@ -1,5 +1,5 @@
$format) {
if(isset($data[$field])) {
- $sql_params[] = $field . ' = ' . $format;
+ $sql_fields[] = $field;
+ $sql_params[] = $format;
$sql_values[] = $data[$field];
}
}
}
if(count($sql_params)) {
- $sql_params = 'SET ' . implode(',', $sql_params);
+ $sql_fields = implode(", ", $sql_fields);
+ $sql_params = implode(", ", $sql_params);
db_query("
INSERT INTO {{$table}}
- $sql_params
- ",
+ ($sql_fields)
+ VALUES ($sql_params)",
$sql_values
);
}
diff -urpw op_video/embed.inc /home/jonny/Desktop/op_video/embed.inc
--- op_video/embed.inc 2008-01-22 05:03:58.000000000 +0000
+++ /home/jonny/Desktop/op_video/embed.inc 2008-07-19 21:41:36.000000000 +0100
@@ -1,5 +1,5 @@
'admin/settings/op_video',
- 'title' => t('Video'),
- 'description' => t('Video settings.'),
- 'callback' => 'drupal_get_form',
- 'callback arguments' => array('_op_video_admin_settings'),
- 'access' => user_access('administer video'),
- 'type' => MENU_NORMAL_ITEM
- );
+ 'title' => t('Video'
+ ), 'description' => t('Video settings.'), 'callback' => 'drupal_get_form', 'callback arguments' => array (
+ '_op_video_admin_settings'
+ ), 'access' => user_access('administer video'), 'type' => MENU_NORMAL_ITEM);
$items[] = array(
'path' => 'op_video/stream',
@@ -77,34 +78,18 @@ function op_video_menu($may_cache) {
$items[] = array(
'path' => 'op_video/path_autocomplete',
- 'title' => t('File autocomplete'),
- 'callback' => '_op_video_path_autocomplete',
- 'access' => TRUE,
- 'type' => MENU_CALLBACK
- );
- }
- else {
+ 'title' => t('File autocomplete'
+ ), 'callback' => '_op_video_path_autocomplete', 'access' => TRUE, 'type' => MENU_CALLBACK);
+ } else {
$items[] = array(
- 'path' => 'op_video/download/' . arg(2),
- 'callback' => '_op_video_download',
- 'callback arguments' => arg(2),
- 'access' => TRUE,
- 'type' => MENU_CALLBACK
- );
+ 'path' => 'op_video/download/' . arg(2
+ ), 'callback' => '_op_video_download', 'callback arguments' => arg(2), 'access' => TRUE, 'type' => MENU_CALLBACK);
$items[] = array(
- 'path' => 'op_video/download/' . arg(2) . '/' . arg(3),
- 'callback' => '_op_video_download',
- 'callback arguments' => arg(2),
- 'access' => TRUE,
- 'type' => MENU_CALLBACK
- );
+ 'path' => 'op_video/download/' . arg(2
+ ) . '/' . arg(3), 'callback' => '_op_video_download', 'callback arguments' => arg(2), 'access' => TRUE, 'type' => MENU_CALLBACK);
$items[] = array(
- 'path' => 'op_video/' . arg(1) . '/embed',
- 'callback' => '_op_video_embed',
- 'callback arguments' => arg(1),
- 'access' => TRUE,
- 'type' => MENU_CALLBACK
- );
+ 'path' => 'op_video/' . arg(1
+ ) . '/embed', 'callback' => '_op_video_embed', 'callback arguments' => arg(1), 'access' => TRUE, 'type' => MENU_CALLBACK);
if(arg(0) == 'node' && arg(1) != 0) {
@@ -113,18 +98,17 @@ function op_video_menu($may_cache) {
$field = _op_video_get_first_video_field($node);
if($field) {
- $video = _op_video_load($node->{$field}[0]['video_id']);
+ $video = _op_video_load($node-> {
+ $field }
+ [0]['video_id']);
- if($video &&
- $content_type_info['fields'][$field]['allow_embed'])
- {
+ if ($video && $content_type_info['fields'][$field]['allow_embed']) {
$items[] = array(
- 'path' => 'node/' . arg(1) . '/embed',
- 'title' => t('Embed'),
- 'type' => MENU_LOCAL_TASK,
- 'callback' => '_op_video_embed_tab',
- 'callback arguments' => array($node, $video['video_id'])
- );
+ 'path' => 'node/' . arg(1
+ ) . '/embed', 'title' => t('Embed'), 'type' => MENU_LOCAL_TASK, 'callback' => '_op_video_embed_tab', 'callback arguments' => array (
+ $node,
+ $video['video_id']
+ ));
}
}
}
@@ -133,7 +117,6 @@ function op_video_menu($may_cache) {
return $items;
}
-
function _op_video_admin_settings() {
_op_video_create_dirs();
@@ -145,14 +128,11 @@ function _op_video_admin_settings() {
$form['op_video_transcoder'] = array(
'#type' => 'radios',
- '#title' => t('Transcoder'),
- '#default_value' => $transcoder,
- '#options' => array(
+ '#title' => t('Transcoder'
+ ), '#default_value' => $transcoder, '#options' => array (
'ffmpeg' => 'Local FFmpeg installation',
'openpackage.biz' => 'OpenPackage Media'
- ),
- '#description' => t($description)
- );
+ ), '#description' => t($description));
$form['ffmpeg'] = _op_video_ffmpeg_settings_fieldset($transcoder == 'ffmpeg');
$form['openpackage'] = _op_video_openpackage_settings_fieldset($transcoder == 'openpackage.biz');
@@ -160,7 +140,6 @@ function _op_video_admin_settings() {
return system_settings_form($form);
}
-
function _op_video_admin_settings_submit($form_id, $form_values) {
_op_video_openpackage_settings_form_submit($form_values);
@@ -168,9 +147,7 @@ function _op_video_admin_settings_submit
system_settings_form_submit($form_id, $form_values);
}
-
-function _op_video_create_video($source_file_id = NULL, $dirty_params_id, $preview_image = 'third',
- $custom_image_file_id = NULL, $nid = NULL, $flv_file_id = NULL, $duration = NULL) {
+function _op_video_create_video($source_file_id = NULL, $dirty_params_id, $preview_image = 'third', $custom_image_file_id = NULL, $nid = NULL, $flv_file_id = NULL, $duration = NULL) {
if(!$source_file_id && !$flv_file_id)
return NULL;
@@ -182,10 +159,7 @@ function _op_video_create_video($source_
);
$data = array(
- 'secret' => md5(user_password()),
- 'dirty_params_id' => $dirty_params_id,
- 'preview_image' => $preview_image
- );
+ 'secret' => md5(user_password()), 'dirty_params_id' => $dirty_params_id, 'preview_image' => $preview_image);
if($source_file_id) {
$fields['source_file_id'] = "%d";
@@ -218,7 +192,6 @@ function _op_video_create_video($source_
return _op_video_db_insert('op_videos', $fields, $data);
}
-
function _op_video_load($video) {
if(!is_array($video)) {
@@ -226,9 +199,7 @@ function _op_video_load($video) {
SELECT *
FROM {op_videos}
WHERE video_id = %d
- ",
- $video
- ));
+ ", $video));
}
if(!$video)
@@ -246,17 +217,13 @@ function _op_video_load($video) {
return $video;
}
-
function _op_video_update_custom_image($video, $file_id) {
db_query("
UPDATE {op_videos}
SET custom_image_file_id = %d
WHERE video_id = %d
- ",
- $file_id,
- $video['video_id']
- );
+ ", $file_id, $video['video_id']);
if($video['custom_image_file_id'])
_op_video_delete_file_row($video['custom_image_file']);
@@ -264,7 +231,6 @@ function _op_video_update_custom_image($
_op_video_purge_image_cache($video['video_id']);
}
-
function _op_video_delete($video) {
if(!is_object($video))
@@ -276,9 +242,7 @@ function _op_video_delete($video) {
db_query("
DELETE FROM {op_videos}
WHERE video_id = %d
- ",
- $video['video_id']
- );
+ ", $video['video_id']);
_op_video_delete_file_row($video['source_file']);
_op_video_delete_file_row($video['flv_file']);
@@ -291,40 +255,32 @@ function _op_video_delete($video) {
db_query("
DELETE FROM {op_video_stats}
WHERE video_id = %d
- ",
- $video['video_id']
- );
+ ", $video['video_id']);
_op_video_purge_image_cache($video['video_id']);
}
-
function _op_video_check_video_id($video_id) {
return db_result(db_query("
SELECT COUNT(*)
FROM {op_videos}
WHERE video_id = %d
- ",
- $video_id
- ));
+ ", $video_id));
}
-
function _op_video_set_render_settings($settings = NULL) {
global $_op_video_render_settings;
$_op_video_render_settings = $settings;
}
-
function _op_video_get_render_setting($setting, $default) {
global $_op_video_render_settings;
return isset($_op_video_render_settings[$setting]) ? $_op_video_render_settings[$setting] : $default;
}
-
function _op_video_render_video($video, $formatter, $nid = 0, $autostart = NULL) {
if($video['flv_file']) {
@@ -341,10 +297,8 @@ function _op_video_render_video($video,
$output = _op_video_render_preview_image_layer($video);
break;
}
- }
- else if(variable_get('op_video_transcoder', OP_VIDEO_DEFAULT_TRANSCODER) == 'openpackage.biz' &&
- user_access('administer video'))
- {
+ } else
+ if (variable_get('op_video_transcoder', OP_VIDEO_DEFAULT_TRANSCODER) == 'openpackage.biz' && user_access('administer video')) {
switch($video['error']) {
case 'none':
@@ -362,26 +316,31 @@ function _op_video_render_video($video,
break;
case 'invalid credentials':
- $output = '' . t('Your credentials are invalid. Please enter your correct openpackage.biz !credlink.',
- array('!credlink' => l('credentials', 'admin/settings/op_video'))) . '
';
+ $output = '' . t('Your credentials are invalid. Please enter your correct openpackage.biz !credlink.', array (
+ '!credlink' => l('credentials',
+ 'admin/settings/op_video'
+ ))) . '
';
break;
case 'insufficient credit':
- $output = '' . t('There was insufficient credit at the time of uploading to transcode this video. Please purchase more credit at !bizlink.',
- array('!bizlink' => l('openpackage.biz', 'http://openpackage.biz/'))) . '
';
+ $output = '' . t('There was insufficient credit at the time of uploading to transcode this video. Please purchase more credit at !bizlink.', array (
+ '!bizlink' => l('openpackage.biz',
+ 'http://openpackage.biz/'
+ ))) . '
';
break;
case 'transcoding failed':
$output = '' . t('Transcoding failed. Please try another video.') . '
';
break;
}
- }
- else {
+ } else {
switch($video['status']) {
case 'dirty':
case 'uploaded':
- $output = '' . t('Processing video... This may take a few minutes. Please !refreshlink.',
- array('!refreshlink'=> l('refresh', $_GET['q']))) . '
';
+ $output = '' . t('Processing video... This may take a few minutes. Please !refreshlink.', array (
+ '!refreshlink' => l('refresh',
+ $_GET['q']
+ ))) . '
';
break;
case 'idle':
@@ -393,7 +352,6 @@ function _op_video_render_video($video,
return $output;
}
-
function rsi($parts, $glue = '') {
if(!is_array($parts))
@@ -406,7 +364,6 @@ function rsi($parts, $glue = '') {
return implode($glue, $parts);
}
-
function _op_video_exec($command, &$output, &$result, $mode = 0) {
if($mode & OP_VIDEO_EXEC_MODE_TIME)
@@ -434,36 +391,30 @@ function _op_video_exec($command, &$outp
ob_flush();
flush();
*/
- }
- else {
+ } else {
system($command, $result);
}
- }
- else {
+ } else {
if(is_array($output)) {
$output[] = $command;
exec($command, $output, $result);
- }
- else {
+ } else {
exec($command, $notoutput, $result);
}
}
}
-
function op_video_cron() {
_op_video_acquire_files();
- if(variable_get('op_video_transcoder', OP_VIDEO_DEFAULT_TRANSCODER) == 'openpackage.biz' &&
- variable_get('op_video_openpackage_return_method', OP_VIDEO_DEFAULT_OPENPACKAGE_RETURN_METHOD) == 'poll') {
+ if (variable_get('op_video_transcoder', OP_VIDEO_DEFAULT_TRANSCODER) == 'openpackage.biz' && variable_get('op_video_openpackage_return_method', OP_VIDEO_DEFAULT_OPENPACKAGE_RETURN_METHOD) == 'poll') {
_op_video_retrieve_videos();
}
_op_video_transcode_videos();
}
-
function _op_video_reset_cron() {
if(variable_get('cron_semaphore', FALSE)) {
@@ -471,7 +422,6 @@ function _op_video_reset_cron() {
}
}
-
function _op_video_stream() {
$video = _op_video_load($_GET['file']);
$pos = (int)$_GET['pos'];
@@ -501,11 +451,9 @@ function _op_video_stream() {
*/
}
-
function _op_video_log($type, $video_id) {
global $user;
-
switch($type) {
case 'view':
@@ -525,33 +473,19 @@ function _op_video_log($type, $video_id)
UPDATE {op_videos}
SET $field = $field + 1
WHERE video_id = %d
- ",
- $video_id
- );
+ ", $video_id);
if(!db_affected_rows())
return;
-
+ // changed from mysql specific to common sql
db_query("
INSERT INTO {op_video_stats}
- SET type = '%s',
- video_id = %d,
- uid = %d,
- sid = '%s',
- ip_addr = %d,
- timestamp = %d
- ",
- $type,
- $video_id,
- $user->uid,
- session_id(),
- ip2long($_SERVER['REMOTE_ADDR']),
- time()
- );
+ (type, video_id, uid, sid, ip_addr, timestamp)
+ VALUES ('%s', %d, %d, '%s', %d, %d)
+ ", $type, $video_id, $user->uid, session_id(), ip2long($_SERVER['REMOTE_ADDR']), time());
}
-
function _op_video_callback() {
switch($_POST['state']) {
@@ -571,7 +505,6 @@ function _op_video_callback() {
_op_video_log($type, $_POST['id']);
}
-
function _op_video_stat_count($type, $duration, $video_id) {
$count = (int)db_result(db_query("
@@ -581,16 +514,11 @@ function _op_video_stat_count($type, $du
video_id = %d AND
timestamp > %d
GROUP BY video_id
- ",
- $type,
- $video_id,
- time() - $duration
- ));
+ ", $type, $video_id, time() - $duration));
return $count;
}
-
function _op_video_download_path($video) {
global $base_url;
@@ -602,7 +530,6 @@ function _op_video_download_path($video)
return $path;
}
-
function _op_video_download($video_id) {
$video = _op_video_load($video_id);
@@ -620,7 +547,6 @@ function _op_video_download($video_id) {
file_transfer($video['source_file']['filepath'], $headers);
}
-
function _op_video_path_autocomplete() {
$args = func_get_args();
$path = implode('/', $args);
@@ -640,12 +566,10 @@ function _op_video_path_autocomplete() {
exit();
}
-
function _op_video_jpeg_quality_change($form_id, $form_values) {
_op_video_purge_image_cache(); // must be called with no args
}
-
function op_video_form_alter($form_id, &$form) {
switch($form_id) {
@@ -671,20 +595,18 @@ function op_video_form_alter($form_id, &
}
}
-
function op_video_node_operations() {
$operations = array(
'retranscode' => array(
- 'label' => t('Retranscode videos'),
+ 'label' => t('Retranscode videos'
+ ),
'callback' => '_op_video_operations_retranscode'
- )
- );
+ ));
return $operations;
}
-
function _op_video_operations_retranscode($nodes) {
foreach($nodes as $nid) {
@@ -695,18 +617,17 @@ function _op_video_operations_retranscod
foreach($fields as $field) {
if($field)
- _op_video_retranscode_video($node->{$field}[0]['video_id']);
+ _op_video_retranscode_video($node-> {
+ $field }
+ [0]['video_id']);
}
}
}
-
function theme_op_video_preview_image($image) {
return $image;
}
-
function theme_op_video_player($player) {
return $player;
}
-
diff -urpw op_video/player.inc /home/jonny/Desktop/op_video/player.inc
--- op_video/player.inc 2008-04-06 23:06:42.000000000 +0100
+++ /home/jonny/Desktop/op_video/player.inc 2008-07-19 21:41:36.000000000 +0100
@@ -1,5 +1,5 @@
Copyright 2005, 2006 Bobby van der Sluis
diff -urpw op_video/views.inc /home/jonny/Desktop/op_video/views.inc
--- op_video/views.inc 2008-06-23 17:18:19.000000000 +0100
+++ /home/jonny/Desktop/op_video/views.inc 2008-07-19 21:41:36.000000000 +0100
@@ -1,5 +1,5 @@