Index: video.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/video/video.module,v
retrieving revision 1.16
diff -u -p -r1.16 video.module
--- video.module	19 Sep 2005 21:41:29 -0000	1.16
+++ video.module	28 Sep 2005 20:13:34 -0000
@@ -299,7 +299,7 @@ function video_settings() {
   $group .= form_textfield(t('Custom field 4 title'), 'video_customfield4', variable_get('video_customfield4', ''), 50, 200);
   $group .= form_textfield(t('Custom field 5 title'), 'video_customfield5', variable_get('video_customfield5', ''), 50, 200);
   $group .= form_textfield(t('Custom field 6 title'), 'video_customfield6', variable_get('video_customfield6', ''), 50, 200);
-  $output .= form_group_collapsible(t('Custom Fields'), $group, TRUE, t('Creates custom fields. Fields only show up if you give them a name.'));
+  $output .= form_group(t('Custom Fields'), $group, t('Creates custom fields. Fields only show up if you give them a name.'));
   return $output;
 }
 
@@ -310,12 +310,9 @@ function video_settings() {
 
 /**
  * Implementation of _node_info().
- *
- * @return
- *   array
  */
-function video_node_info() {
-  return array('video' => array('name' => t('video'), 'base' => 'video'));
+function video_node_name($node) {
+  return t('video');
 }
 
 /**
@@ -350,7 +347,7 @@ function video_form(&$node) {
     $group = form_checkbox(t('Disable multi-file downloads'), 'disable_multidownload', 1, $node->disable_multidownload, t('Disables multi-file downloads for this video only.'));
     $group .= form_textfield(t('Multi-file download folder'), 'download_folder', $node->download_folder, 25, 255, t('Enter the folder containing your videos. It must be relative from the drupal directory. If the absolute path is "C:\inetpub\drupal\videos\projectfolder\" or "/usr/htdocs/drupal/videos/projectfolder/" then enter something like "videos/projectfolder/".'));
     $group .= form_checkbox(t('Show files in "play" folder'), 'use_play_folder', 1, $node->use_play_folder, t('Display videos in the same directory as the "play" video. If folder above is entered this will be in addition.'));
-    $output .= form_group_collapsible(t('Multiple files in download tab'), $group, TRUE, t('These options allow you to have multiple files shown on the download page. This is useful for allowing users to download different file sizes and video formats. ') . l(t('More information.'), 'video/help#multi-download'));
+    $output .= form_group(t('Multiple files in download tab'), $group, t('These options allow you to have multiple files shown on the download page. This is useful for allowing users to download different file sizes and video formats. ') . l(t('More information.'), 'video/help#multi-download'));
   }
 
   $group = form_textfield(t('Size'), 'size', $node->size, 12, 12, t('If the video is on the local server the size will be set automatically. Otherwise enter a value. Entering 0 will turn the display off. Must be less than 2GB.'), null, true);
@@ -383,14 +380,14 @@ function video_form(&$node) {
     $group .= form_textarea(variable_get('video_customfield6', 'Field 6'), 'custom_field_6', $node->custom_field_6, 60, 4, t(''));
   }
   if ($group != '') { //Only display the group if it has fields.
-    $output .= form_group_collapsible(variable_get('video_customfieldtitle', 'Custom Fields'), $group, variable_get('video_customgroupcollapsed', '0'), t(''));
+    $output .= form_group(variable_get('video_customfieldtitle', 'Custom Fields'), $group, t(''));
   }
 
   $group = form_textfield(t('Video Bitrate'), 'video_bitrate', ($node->video_bitrate == 0) ? '' : $node->video_bitrate, 11, 11, t('Integer value of video bitrate'));
   $group .= form_textfield(t('Audio Bitrate'), 'audio_bitrate', ($node->audio_bitrate == 0) ? '' : $node->audio_bitrate, 11, 11, t('Integer value of audio bitrate'));
   $group .= form_textfield(t('Audio Sampling Rate'), 'audio_sampling_rate', ($node->audio_sampling_rate == 0) ? '' : $node->audio_sampling_rate, 11, 11, t('Integer value of audio sampling rate in Hz'));
   $group .= form_select(t('Audio Channels'), 'audio_channels', $node->audio_channels, array('' => '', '5.1' => t('5.1'), 'stereo' => t('Stereo'), 'mono' => t('Mono')));
-  $output .= form_group_collapsible(t('Optional Metadata'), $group, TRUE, t('Metadata entered here will not be displayed. It is currently for administrative reference only.'));
+  $output .= form_group(t('Optional Metadata'), $group, t('Metadata entered here will not be displayed. It is currently for administrative reference only.'));
 
   if (function_exists('taxonomy_node_form')) {
     $output .= implode('', taxonomy_node_form('video', $node));
@@ -948,12 +945,12 @@ function theme_video_view(&$node) {
   //Run the fields through the input filter set for the node, then remove paragraphs.
   //Removes the <p> and </p> tags from the filter pass return. This allows each field to be on one line.
   //A better system might be to remove only the first and last <p></P> tags.
-  $field1 = str_replace(array('<p>', '</p>'), '', check_markup($node->custom_field_1, $node->format, FALSE));
-  $field2 = str_replace(array('<p>', '</p>'), '', check_markup($node->custom_field_2, $node->format, FALSE));
-  $field3 = str_replace(array('<p>', '</p>'), '', check_markup($node->custom_field_3, $node->format, FALSE));
-  $field4 = str_replace(array('<p>', '</p>'), '', check_markup($node->custom_field_4, $node->format, FALSE));
-  $field5 = str_replace(array('<p>', '</p>'), '', check_markup($node->custom_field_5, $node->format, FALSE));
-  $field6 = str_replace(array('<p>', '</p>'), '', check_markup($node->custom_field_6, $node->format, FALSE));
+  $field1 = str_replace(array('<p>', '</p>'), '', check_output($node->custom_field_1, $node->format, FALSE));
+  $field2 = str_replace(array('<p>', '</p>'), '', check_output($node->custom_field_2, $node->format, FALSE));
+  $field3 = str_replace(array('<p>', '</p>'), '', check_output($node->custom_field_3, $node->format, FALSE));
+  $field4 = str_replace(array('<p>', '</p>'), '', check_output($node->custom_field_4, $node->format, FALSE));
+  $field5 = str_replace(array('<p>', '</p>'), '', check_output($node->custom_field_5, $node->format, FALSE));
+  $field6 = str_replace(array('<p>', '</p>'), '', check_output($node->custom_field_6, $node->format, FALSE));
 
   //Make sure all the titles and fields are not blank, if not then display them.
   if (($title1 . $title2 . $title3 . $title4 . $title5 . $title6) != '' and ($field1 . $field2 . $field3 . $field4 . $field5 . $field6) != '') {