diff -urNp mediafield/audiofield.info mediafield_new/audiofield.info --- mediafield/audiofield.info 1969-12-31 19:00:00.000000000 -0500 +++ mediafield_new/audiofield.info 2007-01-21 12:02:21.000000000 -0500 @@ -0,0 +1,4 @@ + name = audiofield + description = Defines a audio file field type for content.module. + dependencies = content + package = "CCK" diff -urNp mediafield/audiofield.module mediafield_new/audiofield.module --- mediafield/audiofield.module 2007-01-17 11:02:51.000000000 -0500 +++ mediafield_new/audiofield.module 2007-01-23 14:27:04.000000000 -0500 @@ -1,16 +1,6 @@ CCK: Defines a audio file field type for content.module.'); - } -} - -/** * Implementation of hook_field_info(). */ function audiofield_field_info() { @@ -115,7 +105,7 @@ function audiofield_widget_settings($op, switch ($op) { case 'form': $form = array(); - $form['save_path'] = array ( + $form['save_path'] = array( '#type' => 'textfield', '#title' => t('Path save uploaded audio file.'), '#default_value' => $widget['save_path'] ? $widget['save_path'] : 'audio', @@ -123,7 +113,7 @@ function audiofield_widget_settings($op, '#maxlength' => 64, '#description' => t('Example audio/dir.') ); - $form['file_extensions'] = array ( + $form['file_extensions'] = array( '#type' => 'textfield', '#title' => t('Permitted upload audio file extensions.'), '#default_value' => $widget['file_extensions'] ? $widget['file_extensions'] : 'mp3 wav mid', @@ -152,15 +142,15 @@ function audiofield_widget($op, &$node, _field_clear_session($field['type']); } - if ($file = file_check_upload($fieldname . '_upload')) { + if ($file = file_check_upload('_upload'. $fieldname)) { $file = (array)$file; - $ext = array_pop(explode('.',$file['filename'])); + $ext = array_pop(explode('.', $file['filename'])); $allowed_extensions = array_unique(explode(' ', trim($field['widget']['file_extensions']))); if (in_array($ext, $allowed_extensions)) { } else { - form_set_error($field['field_name'] .'_upload',t('Files with the extension %ext are not allowed. Please upload a file with an extension from the following list: %allowed_extensions', array('%ext' => theme('placeholder',$ext), '%allowed_extensions' => theme('placeholder', $field['widget']['file_extensions'])))); + form_set_error($field['field_name'] .'_upload', t('Files with the extension %ext are not allowed. Please upload a file with an extension from the following list: %allowed_extensions', array('%ext' => theme('placeholder', $ext), '%allowed_extensions' => theme('placeholder', $field['widget']['file_extensions'])))); return FALSE; } @@ -177,7 +167,7 @@ function audiofield_widget($op, &$node, case 'form': if (is_array($_SESSION[$type][$fieldname]) && count($_SESSION[$type][$fieldname])) { - foreach($_SESSION[$type][$fieldname] as $delta => $file) { + foreach ($_SESSION[$type][$fieldname] as $delta => $file) { $node_field[] = $file; } } @@ -200,7 +190,7 @@ function audiofield_widget($op, &$node, function _audiofield_widget_form($node, $field, &$node_field) { $fieldname = $field['field_name']; - theme_add_style(drupal_get_path('module', 'multimediafile') .'/audiofield.css'); + drupal_add_css(drupal_get_path('module', 'audiofield') .'/audiofield.css'); $form = array(); $form[$fieldname] = array( @@ -212,7 +202,6 @@ function _audiofield_widget_form($node, '#tree' => TRUE, '#theme' => 'audiofield_current', ); - $form[$fieldname][$fieldname .'_upload'] = array( '#type' => 'file', '#description' => $field['widget']['description'] . t('
allowed extensions(%ext)', array('%ext' => theme('placeholder', $field['widget']['file_extensions']))), @@ -223,14 +212,14 @@ function _audiofield_widget_form($node, $form[$fieldname]['Update'] = array( '#type' => 'button', '#value' => t('Update'), - '#name' => 'cck_audiofield_'.$fieldname.'_op', - '#attributes' => array('id' => $fieldname.'-attach-button'), + '#name' => 'cck_audiofield_'. $fieldname .'_op', + '#attributes' => array('id' => $fieldname .'-attach-button'), '#tree' => FALSE, '#weight' => 10, ); if (is_array($node_field) && count($node_field)) { - foreach($node_field as $delta => $file) { + foreach ($node_field as $delta => $file) { if ($file['filepath']) { $form[$fieldname][$delta]['icon'] = array( '#type' => 'markup', @@ -260,7 +249,7 @@ function _audiofield_widget_form($node, $form[$fieldname][$delta]['msample_rate'] = array('#type' => 'markup', '#value' => format_samplerate($info['sample_rate'])); $form[$fieldname][$delta]['mbitrate'] = array('#type' => 'markup', '#value' => format_bitrate($info['bitrate'])); $form[$fieldname][$delta]['mchanel_mode'] = array('#type' => 'markup', '#value' => $info['channelmode']); - $form[$fieldname][$delta]['mplaytime'] = array('#type' => 'markup', '#value' => $info['playtime'].' min'); + $form[$fieldname][$delta]['mplaytime'] = array('#type' => 'markup', '#value' => $info['playtime'] .' min'); $form[$fieldname][$delta]['filename'] = array('#type' => 'value', '#value' => $file['filename']); $form[$fieldname][$delta]['filepath'] = array('#type' => 'value', '#value' => $file['filepath']); @@ -291,21 +280,21 @@ function theme_audiofield_current(&$form foreach (element_children($form) as $key) { if (is_numeric($key)) { $row = array(); - $row[] = form_render($form[$key]['icon']); - $row[] = form_render($form[$key]['name']); - $row[] = form_render($form[$key]['msample_rate']); - $row[] = form_render($form[$key]['mbitrate']); - $row[] = form_render($form[$key]['mchanel_mode']); - $row[] = form_render($form[$key]['mplaytime']); - $row[] = form_render($form[$key]['size']); - $row[] = form_render($form[$key]['remove']); + $row[] = drupal_render($form[$key]['icon']); + $row[] = drupal_render($form[$key]['name']); + $row[] = drupal_render($form[$key]['msample_rate']); + $row[] = drupal_render($form[$key]['mbitrate']); + $row[] = drupal_render($form[$key]['mchanel_mode']); + $row[] = drupal_render($form[$key]['mplaytime']); + $row[] = drupal_render($form[$key]['size']); + $row[] = drupal_render($form[$key]['remove']); $rows[] = $row; } } if (count($rows)) { $output = theme('table', $header, $rows); } - $output .= form_render($form); + $output .= drupal_render($form); return $output; } @@ -324,7 +313,7 @@ function audiofield_field_formatter_info } function audiofield_field_formatter($field, $item, $formatter) { - if(!isset($item['fid'])) { + if (!isset($item['fid'])) { return ''; } $file = _field_file_load($item['fid']); @@ -332,8 +321,8 @@ function audiofield_field_formatter($fie } function theme_audiofield_icon($file) { - $ext = array_pop(explode('.',$file['filename'])); - $known_extensions = array('m3u', 'midi','mid','mov','mp3','mpeg','mpg', 'wav','wma','wmv'); + $ext = array_pop(explode('.', $file['filename'])); + $known_extensions = array('m3u', 'midi', 'mid', 'mov', 'mp3', 'mpeg', 'mpg', 'wav', 'wma', 'wmv'); if (!in_array($ext, $known_extensions)) { $ext = 0; } @@ -362,7 +351,7 @@ function theme_audiofield($file, $item, $item['sample_rate'] = format_samplerate($item['sample_rate']); $item['bitrate'] = format_bitrate($item['bitrate']); $item['filesize'] = format_filesize($item['filesize']); - $url = ''.check_plain($name).''; + $url = ''. check_plain($name) .''; $info = sprintf("
%s %s min %s %s (%s)
", $item['sample_rate'], $item['bitrate'], $url, $item['playtime'], $item['filesize']); @@ -377,20 +366,19 @@ function audio_getid3_info($path) { $info = &getID3Analyze($path); - $result['format_name'] = @$info['fileformat']; - $result['encoder_version'] = @$info['audio']['encoder']; - $result['encoder_options'] = @$info['audio']['encoder_options']; - $result['bitrate_mode'] = @$info['audio']['bitrate_mode']; - $result['channelmode'] = @$info['audio']['channelmode']; - $result['sample_rate'] = @$info['audio']['sample_rate']; - $result['bits_per_sample'] = @$info['audio']['bits_per_sample']; - $result['playtime'] = @$info['playtime_string']; - $result['bitrate'] = @$info['audio']['bitrate']; - $result['tags'] = @$info['tags']; - $result['comments'] = @$info['comments']; - $result['warning'] = @$info['warning']; + $result['format_name'] = @$info['fileformat']; + $result['encoder_version'] = @$info['audio']['encoder']; + $result['encoder_options'] = @$info['audio']['encoder_options']; + $result['bitrate_mode'] = @$info['audio']['bitrate_mode']; + $result['channelmode'] = @$info['audio']['channelmode']; + $result['sample_rate'] = @$info['audio']['sample_rate']; + $result['bits_per_sample'] = @$info['audio']['bits_per_sample']; + $result['playtime'] = @$info['playtime_string']; + $result['bitrate'] = @$info['audio']['bitrate']; + $result['tags'] = @$info['tags']; + $result['comments'] = @$info['comments']; + $result['warning'] = @$info['warning']; return $result; } - -?> \ No newline at end of file +?> diff -urNp mediafield/multimediafile.inc mediafield_new/multimediafile.inc --- mediafield/multimediafile.inc 2007-01-17 11:02:51.000000000 -0500 +++ mediafield_new/multimediafile.inc 2007-01-22 21:02:11.000000000 -0500 @@ -10,7 +10,7 @@ */ function _field_file_insert($node, &$file, $field) { $fieldname = $field['field_name']; - if ($file = file_save_upload((object)$file, file_directory_path() . '/'.$field['widget']['save_path'].'/'.$file['filename'])) { + if ($file = file_save_upload((object)$file, file_directory_path() .'/'. $field['widget']['save_path'] .'/'. $file['filename'])) { $file = (array)$file; $file['fid'] = db_next_id('{files}_fid'); db_query('INSERT into {files} (fid, nid, filename, filepath, filemime, filesize) @@ -160,10 +160,10 @@ function format_filesize($size) { $result = ''; if ($size > 0) { $result = sprintf("%.02f MB", $size/1000); - }else { + } else { $result = sprintf("%.02f Kb", $size); } return $result; } -?> \ No newline at end of file +?> diff -urNp mediafield/videofield.info mediafield_new/videofield.info --- mediafield/videofield.info 1969-12-31 19:00:00.000000000 -0500 +++ mediafield_new/videofield.info 2007-01-21 12:02:33.000000000 -0500 @@ -0,0 +1,4 @@ + name = videofield + description = Defines a video file field type for content.module. + dependencies = content + package = "CCK" diff -urNp mediafield/videofield.module mediafield_new/videofield.module --- mediafield/videofield.module 2007-01-17 11:02:51.000000000 -0500 +++ mediafield_new/videofield.module 2007-01-23 14:27:18.000000000 -0500 @@ -1,16 +1,6 @@ CCK: Defines a video file field type for content.module.'); - } -} - -/** * Implementation of hook_field_info(). */ function videofield_field_info() { @@ -120,7 +110,7 @@ function videofield_widget_settings($op, switch ($op) { case 'form': $form = array(); - $form['save_path'] = array ( + $form['save_path'] = array( '#type' => 'textfield', '#title' => t('Path save uploaded video file.'), '#default_value' => $widget['save_path'] ? $widget['save_path'] : 'video', @@ -128,7 +118,7 @@ function videofield_widget_settings($op, '#maxlength' => 64, '#description' => t('Example video/dir.') ); - $form['file_extensions'] = array ( + $form['file_extensions'] = array( '#type' => 'textfield', '#title' => t('Permitted upload video file extensions.'), '#default_value' => $widget['file_extensions'] ? $widget['file_extensions'] : 'avi mpg ogg wmv', @@ -157,14 +147,14 @@ function videofield_widget($op, &$node, _field_clear_session($type); } - if ($file = file_check_upload($fieldname . '_upload')) { + if ($file = file_check_upload($fieldname .'_upload')) { $file = (array)$file; - $ext = array_pop(explode('.',$file['filename'])); + $ext = array_pop(explode('.', $file['filename'])); $allowed_extensions = array_unique(explode(' ', trim($field['widget']['file_extensions']))); if (in_array($ext, $allowed_extensions)) { } else { - form_set_error($field['field_name'] .'_upload',t('Files with the extension %ext are not allowed. Please upload a file with an extension from the following list: %allowed_extensions', array('%ext' => theme('placeholder',$ext), '%allowed_extensions' => theme('placeholder', $field['widget']['file_extensions'])))); + form_set_error($field['field_name'] .'_upload', t('Files with the extension %ext are not allowed. Please upload a file with an extension from the following list: %allowed_extensions', array('%ext' => theme('placeholder', $ext), '%allowed_extensions' => theme('placeholder', $field['widget']['file_extensions'])))); return FALSE; } @@ -181,7 +171,7 @@ function videofield_widget($op, &$node, case 'form': if (is_array($_SESSION[$type][$fieldname]) && count($_SESSION[$type][$fieldname])) { - foreach($_SESSION[$type][$fieldname] as $delta => $file) { + foreach ($_SESSION[$type][$fieldname] as $delta => $file) { $node_field[] = $file; } } @@ -204,7 +194,7 @@ function videofield_widget($op, &$node, function _videofield_widget_form($node, $field, &$node_field) { $fieldname = $field['field_name']; - theme_add_style(drupal_get_path('module', 'videofield') .'/videofield.css'); + drupal_add_css(drupal_get_path('module', 'videofield') .'/videofield.css'); $form = array(); $form[$fieldname] = array( @@ -227,14 +217,14 @@ function _videofield_widget_form($node, $form[$fieldname]['Update'] = array( '#type' => 'button', '#value' => t('Update'), - '#name' => 'cck_videofield_'.$fieldname.'_op', - '#attributes' => array('id' => $fieldname.'-attach-button'), + '#name' => 'cck_videofield_'. $fieldname .'_op', + '#attributes' => array('id' => $fieldname .'-attach-button'), '#tree' => FALSE, '#weight' => 10, ); if (is_array($node_field) && count($node_field)) { - foreach($node_field as $delta => $file) { + foreach ($node_field as $delta => $file) { if ($file['filepath']) { $form[$fieldname][$delta]['icon'] = array( '#type' => 'markup', @@ -262,14 +252,14 @@ function _videofield_widget_form($node, $form[$fieldname][$delta]['remove'] = array('#type' => 'checkbox', '#default_value' => $file['remove']); $form[$fieldname][$delta]['mfileformat'] = array('#type' => 'markup', '#value' => $info['fileformat']); - $form[$fieldname][$delta]['mvideosize'] = array('#type' => 'markup', '#value' => $info['videox'].'x'.$info['videoy']); + $form[$fieldname][$delta]['mvideosize'] = array('#type' => 'markup', '#value' => $info['videox'] .'x'. $info['videoy']); $form[$fieldname][$delta]['mbps'] = array('#type' => 'markup', '#value' => $info['bps']); $form[$fieldname][$delta]['mvideocodec'] = array('#type' => 'markup', '#value' => $info['videocodec']); $form[$fieldname][$delta]['maudiocodec'] = array('#type' => 'markup', '#value' => $info['audiocodec']); $form[$fieldname][$delta]['msample_rate'] = array('#type' => 'markup', '#value' => format_samplerate($info['sample_rate'])); $form[$fieldname][$delta]['mchanel_mode'] = array('#type' => 'markup', '#value' => $info['channelmode']); - $form[$fieldname][$delta]['mplaytime'] = array('#type' => 'markup', '#value' => $info['playtime'].' min'); + $form[$fieldname][$delta]['mplaytime'] = array('#type' => 'markup', '#value' => $info['playtime'] .' min'); $form[$fieldname][$delta]['filename'] = array('#type' => 'value', '#value' => $file['filename']); $form[$fieldname][$delta]['filepath'] = array('#type' => 'value', '#value' => $file['filepath']); @@ -309,8 +299,8 @@ function theme_videofield_current(&$form $row[] = form_render($form[$key]['ico']); $row[] = form_render($form[$key]['name']); - $row[] = form_render($form[$key]['mfileformat']).','.form_render($form[$key]['mvideosize']).','.form_render($form[$key]['mvideocodec']).','.form_render($form[$key]['mbps']); - $row[] = form_render($form[$key]['msample_rate']).','.form_render($form[$key]['mchanel_mode']).','.form_render($form[$key]['maudiocodec']); + $row[] = form_render($form[$key]['mfileformat']) .','. form_render($form[$key]['mvideosize']) .','. form_render($form[$key]['mvideocodec']) .','. form_render($form[$key]['mbps']); + $row[] = form_render($form[$key]['msample_rate']) .','. form_render($form[$key]['mchanel_mode']) .','. form_render($form[$key]['maudiocodec']); $row[] = form_render($form[$key]['mplaytime']); $row[] = form_render($form[$key]['size']); @@ -340,7 +330,7 @@ function videofield_field_formatter_info } function videofield_field_formatter($field, $item, $formatter) { - if(!isset($item['fid'])) { + if (!isset($item['fid'])) { return ''; } $file = _field_file_load($item['fid']); @@ -348,8 +338,8 @@ function videofield_field_formatter($fie } function theme_videofield_icon($file) { - $ext = array_pop(explode('.',$file['filename'])); - $known_extensions = array('m3u', 'midi','mid','mov','mp3','mpeg','mpg', 'wav','wma','wmv'); + $ext = array_pop(explode('.', $file['filename'])); + $known_extensions = array('m3u', 'midi', 'mid', 'mov', 'mp3', 'mpeg', 'mpg', 'wav', 'wma', 'wmv'); if (!in_array($ext, $known_extensions)) { $ext = 0; } @@ -375,33 +365,33 @@ function theme_videofield($file, $item, $url = file_create_url($path); $name = $file['filename']; $desc = $file['description']; - $url = ''.check_plain($name).''; + $url = ''. check_plain($name) .''; $rows = array(); $rows[] = array( array('data' => t('Name:'), 'class' => 'col-label'), array('data' => $url, 'class' => 'col-field'), ); - $video = $item['fileformat'].','.$item['videox'].'x'.$item['videoy'].','.$item['videocodec'].','.$item['bits_per_sample']; + $video = $item['fileformat'] .','. $item['videox'] .'x'. $item['videoy'] .','. $item['videocodec'] .','. $item['bits_per_sample']; $rows[] = array( array('data' => t('Video:'), 'class' => 'col-label'), array('data' => $video, 'class' => 'col-field'), ); - $audio = format_samplerate($item['sample_rate']).','.$item['chanel_mode'].','.$item['audiocodec']; + $audio = format_samplerate($item['sample_rate']) .','. $item['chanel_mode'] .','. $item['audiocodec']; $rows[] = array( array('data' => t('Audio:'), 'class' => 'col-label'), array('data' => $audio, 'class' => 'col-field'), ); $rows[] = array( array('data' => t('Duration:'), 'class' => 'col-label'), - array('data' => $item['playtime'].' min', 'class' => 'col-field'), + array('data' => $item['playtime'] .' min', 'class' => 'col-field'), ); $rows[] = array( array('data' => t('Size:'), 'class' => 'col-label'), array('data' => format_filesize($item['filesize']), 'class' => 'col-field'), ); - return theme('table', array('',''), $rows); + return theme('table', array('', ''), $rows); } } @@ -420,12 +410,11 @@ function video_getid3_info($path) { $other = @reset($info['audio']['streams']); $result['audiocodec'] = @$other['codec']; - $result['fileformat'] = @$info['video']['dataformat']; - $result['channelmode'] = @$info['audio']['channelmode']; - $result['sample_rate'] = @$info['audio']['sample_rate']; - $result['playtime'] = @$info['playtime_string']; + $result['fileformat'] = @$info['video']['dataformat']; + $result['channelmode'] = @$info['audio']['channelmode']; + $result['sample_rate'] = @$info['audio']['sample_rate']; + $result['playtime'] = @$info['playtime_string']; return $result; } - -?> \ No newline at end of file +?>