diff -urp emfield.old/contrib/emvideo/emvideo.module emfield/contrib/emvideo/emvideo.module
--- emfield.old/contrib/emvideo/emvideo.module	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/emvideo.module	2008-09-08 13:25:02.000000000 +0200
@@ -89,7 +89,7 @@ function emvideo_theme() {
         'arguments' => array('element' => NULL),
         'file' => 'emvideo.theme.inc'
     ),
-	'emvideo_formatter_thickbox' => array(
+    'emvideo_formatter_thickbox' => array(
         'arguments' => array('element' => NULL),
         'file' => 'emvideo.theme.inc'
     ),
@@ -269,21 +269,21 @@ function emvideo_widget_settings($op, $w
           '#type' => 'fieldset',
           '#title' => t('Video Display Settings'),
           '#description' => t('These settings control how this video is displayed in its full size, which defaults to @widthx@height.', array('@width' => $width, '@height' => $height)),
-          '#collapsible' => true,
-          '#collapsed' => false,
+          '#collapsible' => TRUE,
+          '#collapsed' => FALSE,
         );
         $form['video']['video_width'] = array(
           '#type' => 'textfield',
           '#title' => t('Video display width'),
           '#default_value' => empty($widget['video_width']) ? $width : $widget['video_width'],
-          '#required' => true,
+          '#required' => TRUE,
           '#description' => t('The width of the video. It defaults to @width.', array('@width' => $width)),
         );
         $form['video']['video_height'] = array(
           '#type' => 'textfield',
           '#title' => t('Video display height'),
           '#default_value' => empty($widget['video_height']) ? $height : $widget['video_height'],
-          '#required' => true,
+          '#required' => TRUE,
           '#description' => t('The height of the video. It defaults to @height.', array('@height' => $height)),
         );
         $form['video']['video_autoplay'] = array(
@@ -299,21 +299,21 @@ function emvideo_widget_settings($op, $w
           '#type' => 'fieldset',
           '#title' => t('Video Preview Settings'),
           '#description' => t('These settings control how this video is displayed in its preview size, which defaults to @widthx@height.', array('@width' => $width, '@height' => $height)),
-          '#collapsible' => true,
-          '#collapsed' => false,
+          '#collapsible' => TRUE,
+          '#collapsed' => FALSE,
         );
         $form['preview']['preview_width'] = array(
           '#type' => 'textfield',
           '#title' => t('Video preview width'),
           '#default_value' => empty($widget['preview_width']) ? $width : $widget['preview_width'],
-          '#required' => true,
+          '#required' => TRUE,
           '#description' => t('The width of the preview video. It defaults to @width.', array('@width' => $width)),
         );
         $form['preview']['preview_height'] = array(
           '#type' => 'textfield',
           '#title' => t('Video preview height'),
           '#default_value' => empty($widget['preview_height']) ? $height : $widget['preview_height'],
-          '#required' => true,
+          '#required' => TRUE,
           '#description' => t('The height of the preview video. It defaults to @height.', array('@height' => $height)),
         );
         $form['preview']['preview_autoplay'] = array(
@@ -329,27 +329,27 @@ function emvideo_widget_settings($op, $w
           '#type' => 'fieldset',
           '#title' => t('Thumbnail'),
           '#description' => t('When displayed as a thumbnail, these settings control the image returned. Note that not all 3rd party video content providers offer thumbnails, and others may require an API key or other requirements. More information from the !settings. The default size for thumbnails is @widthx@height.', array('!settings' => l(t('settings page'), 'admin/content/emfield'), '@width' => $width, '@height' => $height)),
-          '#collapsible' => true,
-          '#collapsed' => false,
+          '#collapsible' => TRUE,
+          '#collapsed' => FALSE,
         );
         $form['tn']['thumbnail_width'] = array(
           '#type' => 'textfield',
           '#title' => t('Thumbnail width'),
           '#default_value' => empty($widget['thumbnail_width']) ? $width : $widget['thumbnail_width'],
-          '#required' => true,
+          '#required' => TRUE,
           '#description' => t('The width of the thumbnail. It defaults to @width.', array('@width' => $width)),
         );
         $form['tn']['thumbnail_height'] = array(
           '#type' => 'textfield',
           '#title' => t('Thumbnail height'),
           '#default_value' => empty($widget['thumbnail_height']) ? $height : $widget['thumbnail_height'],
-          '#required' => true,
+          '#required' => TRUE,
           '#description' => t('The height of the thumbnail. It defaults to @height.', array('@height' => $height)),
         );
         if (!module_exists('emthumb')) {
           $tn_desc = t(' You may be interested in activating the Embedded Media Thumbnails module as well, which will allow you to specify custom thumbnails on a per-node basis.');
         }
-		$default_path = variable_get('emvideo_default_thumbnail_path', '');
+        $default_path = variable_get('emvideo_default_thumbnail_path', '');
         $form['tn']['thumbnail_default_path'] = array(
           '#type' => 'textfield',
           '#title' => t('Default thumbnail path'),
diff -urp emfield.old/contrib/emvideo/emvideo.theme.inc emfield/contrib/emvideo/emvideo.theme.inc
--- emfield.old/contrib/emvideo/emvideo.theme.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/emvideo.theme.inc	2008-09-08 13:22:24.000000000 +0200
@@ -96,7 +96,7 @@ function theme_emvideo_video_thumbnail($
       $output = '<img src="'. $thumbnail_url .'" width="'. $width  .'" height="'. $height  .'" alt="'. $image_alt .'" title="'. $image_title .'" />';
     }
     else {
-      $output = l('<img src="'. $thumbnail_url .'" width="'. $width  .'" height="'. $height  .'" alt="'. $image_alt .'" title="'. $image_title .'" />', $link_url, array('html'=> true));
+      $output = l('<img src="'. $thumbnail_url .'" width="'. $width  .'" height="'. $height  .'" alt="'. $image_alt .'" title="'. $image_title .'" />', $link_url, array('html' => TRUE));
     }
   }
   else {
diff -urp emfield.old/contrib/emvideo/providers/bliptv.inc emfield/contrib/emvideo/providers/bliptv.inc
--- emfield.old/contrib/emvideo/providers/bliptv.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/bliptv.inc	2008-09-08 13:16:47.000000000 +0200
@@ -147,7 +147,7 @@ function emvideo_bliptv_data($field, $it
   // this is the code actually used by the player, even though it's different than for the page
   if ($rss['ITEM']['BLIP:POSTS_ID'][0]) {
     $data['post_id'] = $rss['ITEM']['BLIP:POSTS_ID'][0];
-  }	
+  }
   return $data;
 }
 
@@ -308,8 +308,8 @@ function emvideo_bliptv_preview($code, $
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_bliptv_emfield_subtheme() {
-  return array (
-    'emvideo_bliptv_flash' => array (
+  return array(
+    'emvideo_bliptv_flash' => array(
       'arguments' => array('code' => NULL, 'width' => NULL, 'height' => NULL, 'field' => NULL, 'item' => NULL, 'autoplay' => NULL, 'flv' => NULL, 'thumbnail' => NULL, 'options' => NULL),
       'file' => 'providers/bliptv.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/brightcove.inc emfield/contrib/emvideo/providers/brightcove.inc
--- emfield.old/contrib/emvideo/providers/brightcove.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/brightcove.inc	2008-09-08 13:17:05.000000000 +0200
@@ -153,8 +153,8 @@ function emvideo_brightcove_preview($emb
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_brightcove_emfield_subtheme() {
-  return array (
-    'emvideo_brightcove_flash' => array (
+  return array(
+    'emvideo_brightcove_flash' => array(
       'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
       'file' => 'providers/brightcove.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/dailymotion.inc emfield/contrib/emvideo/providers/dailymotion.inc
--- emfield.old/contrib/emvideo/providers/dailymotion.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/dailymotion.inc	2008-09-08 13:17:13.000000000 +0200
@@ -174,8 +174,8 @@ function emvideo_dailymotion_preview($em
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_dailymotion_emfield_subtheme() {
-  return array (
-    'emvideo_dailymotion_flash' => array (
+  return array(
+    'emvideo_dailymotion_flash' => array(
       'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
       'file' => 'providers/dailymotion.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/google.inc emfield/contrib/emvideo/providers/google.inc
--- emfield.old/contrib/emvideo/providers/google.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/google.inc	2008-09-08 13:17:18.000000000 +0200
@@ -190,8 +190,8 @@ function emvideo_google_preview($embed, 
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_google_emfield_subtheme() {
-  return array (
-    'emvideo_google_flash' => array (
+  return array(
+    'emvideo_google_flash' => array(
       'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
       'file' => 'providers/google.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/guba.inc emfield/contrib/emvideo/providers/guba.inc
--- emfield.old/contrib/emvideo/providers/guba.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/guba.inc	2008-09-08 13:18:28.000000000 +0200
@@ -1,6 +1,11 @@
 <?php
 // $Id: guba.inc,v 1.1.2.2 2008/08/16 16:14:39 alexua Exp $
 
+/**
+ * @file
+ *   Provide support for the Guba provider to the emfield.module.
+ */
+
 define('EMVIDEO_GUBA_MAIN_URL', 'http://www.guba.com/');
 define('EMVIDEO_GUBA_API_INFO', 'http://www.guba.com/restApiDoc/restReference.html');
 define('EMVIDEO_GUBA_API_APPLICATION_URL', 'http://www.guba.com/developers.html');
@@ -27,8 +32,8 @@ function emvideo_guba_settings() {
     '#type' => 'fieldset',
     '#title' => t('GUBA API'),
     '#description' => t('If you wish to be able to display GUBA thumbnails automatically, you will first need to apply for an API Developer Key from the !guba. Note that you do not need this key to display GUBA videos themselves.', array('!guba' => l('GUBA Developer Profile page', EMVIDEO_GUBA_API_APPLICATION_URL, array('target' => '_blank')))),
-    '#collapsible' => true,
-    '#collapsed' => true,
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
   );
   $form['guba']['api']['emvideo_guba_api_key'] = array(
     '#type' => 'textfield',
@@ -85,8 +90,8 @@ function emvideo_guba_preview($embed, $w
 }
 
 function emvideo_guba_emfield_subtheme() {
-  return array (
-  'emvideo_guba_flash' => array (
+  return array(
+  'emvideo_guba_flash' => array(
   'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
   'file' => 'providers/guba.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/imeem.inc emfield/contrib/emvideo/providers/imeem.inc
--- emfield.old/contrib/emvideo/providers/imeem.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/imeem.inc	2008-09-08 13:18:42.000000000 +0200
@@ -1,6 +1,11 @@
 <?php
 // $Id: imeem.inc,v 1.1.2.2 2008/08/16 16:14:39 alexua Exp $
 
+/**
+ * @file
+ *   Provide support for the imeem provider to the emfield.module.
+ */
+
 define('EMVIDEO_IMEEM_MAIN_URL', 'http://www.imeem.com/');
 define('EMVIDEO_IMEEM_API_INFO', 'http://www.imeem.com/developers/documentation/');
 define('EMVIDEO_IMEEM_API_APPLICATION_URL', 'http://www.imeem.com/developers/');
@@ -28,8 +33,8 @@ function emvideo_imeem_settings() {
     '#type' => 'fieldset',
     '#title' => t('IMEEM API'),
     '#description' => t('If you wish to be able to display IMEEM thumbnails automatically, you will first need to apply for an API Developer Key from the !imeem. Note that you do not need this key to display IMEEM videos themselves.', array('!imeem' => l('IMEEM Developer Profile page', EMVIDEO_IMEEM_API_APPLICATION_URL, array('target' => '_blank')))),
-    '#collapsible' => true,
-    '#collapsed' => true,
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
   );
   $form['imeem']['api']['emvideo_imeem_api_key'] = array(
     '#type' => 'textfield',
@@ -95,8 +100,8 @@ function emvideo_imeem_preview($embed, $
 }
 
 function emvideo_imeem_emfield_subtheme() {
-  return array (
-  'emvideo_imeem_flash' => array (
+  return array(
+  'emvideo_imeem_flash' => array(
   'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
   'file' => 'providers/imeem.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/jumpcut.inc emfield/contrib/emvideo/providers/jumpcut.inc
--- emfield.old/contrib/emvideo/providers/jumpcut.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/jumpcut.inc	2008-09-08 13:17:25.000000000 +0200
@@ -65,8 +65,8 @@ function emvideo_jumpcut_preview($embed,
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_jumpcut_emfield_subtheme() {
-  return array (
-    'emvideo_jumpcut_flash' => array (
+  return array(
+    'emvideo_jumpcut_flash' => array(
       'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL),
       'file' => 'providers/jumpcut.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/lastfm.inc emfield/contrib/emvideo/providers/lastfm.inc
--- emfield.old/contrib/emvideo/providers/lastfm.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/lastfm.inc	2008-09-08 13:18:50.000000000 +0200
@@ -1,6 +1,11 @@
 <?php
 // $Id: lastfm.inc,v 1.1.2.2 2008/08/16 16:14:39 alexua Exp $
 
+/**
+ * @file
+ *   Provide support for Last.fm to the emfield.module.
+ */
+
 define('EMVIDEO_LASTFM_MAIN_URL', 'http://www.lastfm.com/');
 
 /**
@@ -165,8 +170,8 @@ function emvideo_lastfm_preview($embed, 
 }
 
 function emvideo_lastfm_emfield_subtheme() {
-  return array (
-  'emvideo_lastfm_flash' => array (
+  return array(
+  'emvideo_lastfm_flash' => array(
   'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
   'file' => 'providers/lastfm.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/livevideo.inc emfield/contrib/emvideo/providers/livevideo.inc
--- emfield.old/contrib/emvideo/providers/livevideo.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/livevideo.inc	2008-09-08 13:17:29.000000000 +0200
@@ -189,8 +189,8 @@ function emvideo_livevideo_preview($embe
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_livevideo_emfield_subtheme() {
-  return array (
-    'emvideo_livevideo_flash' => array (
+  return array(
+    'emvideo_livevideo_flash' => array(
       'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
       'file' => 'providers/livevideo.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/metacafe.inc emfield/contrib/emvideo/providers/metacafe.inc
--- emfield.old/contrib/emvideo/providers/metacafe.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/metacafe.inc	2008-09-08 13:17:32.000000000 +0200
@@ -79,8 +79,8 @@ function emvideo_metacafe_preview($embed
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_metacafe_emfield_subtheme() {
-  return array (
-    'emvideo_metacafe_flash' => array (
+  return array(
+    'emvideo_metacafe_flash' => array(
       'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
       'file' => 'providers/metacafe.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/myspace.inc emfield/contrib/emvideo/providers/myspace.inc
--- emfield.old/contrib/emvideo/providers/myspace.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/myspace.inc	2008-09-08 13:17:35.000000000 +0200
@@ -117,8 +117,8 @@ function emvideo_myspace_preview($embed,
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_myspace_emfield_subtheme() {
-  return array (
-    'emvideo_myspace_flash' => array (
+  return array(
+    'emvideo_myspace_flash' => array(
       'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
       'file' => 'providers/myspace.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/revver.inc emfield/contrib/emvideo/providers/revver.inc
--- emfield.old/contrib/emvideo/providers/revver.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/revver.inc	2008-09-08 13:17:37.000000000 +0200
@@ -82,8 +82,8 @@ function emvideo_revver_preview($embed, 
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_revver_emfield_subtheme() {
-  return array (
-    'emvideo_revver_flash' => array (
+  return array(
+    'emvideo_revver_flash' => array(
       'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
       'file' => 'providers/revver.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/sevenload.inc emfield/contrib/emvideo/providers/sevenload.inc
--- emfield.old/contrib/emvideo/providers/sevenload.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/sevenload.inc	2008-09-08 13:17:40.000000000 +0200
@@ -136,8 +136,8 @@ function emvideo_sevenload_preview($embe
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_sevenload_emfield_subtheme() {
-  return array (
-    'emvideo_sevenload_flash' => array (
+  return array(
+    'emvideo_sevenload_flash' => array(
       'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL),
       'file' => 'providers/sevenload.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/spike.inc emfield/contrib/emvideo/providers/spike.inc
--- emfield.old/contrib/emvideo/providers/spike.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/spike.inc	2008-09-08 13:17:43.000000000 +0200
@@ -80,8 +80,8 @@ function emvideo_spike_preview($embed, $
  * Implementation of hook_emfield_subtheme.
  */
 function emvideo_spike_emfield_subtheme() {
-  return array (
-    'emvideo_spike_flash' => array (
+  return array(
+    'emvideo_spike_flash' => array(
       'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
       'file' => 'providers/spike.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/tudou.inc emfield/contrib/emvideo/providers/tudou.inc
--- emfield.old/contrib/emvideo/providers/tudou.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/tudou.inc	2008-09-08 13:18:59.000000000 +0200
@@ -1,6 +1,11 @@
 <?php
 // $Id: tudou.inc,v 1.1.2.1 2008/08/10 22:22:12 alexua Exp $
 
+/**
+ * @file
+ *   Provide support for the Tudou provider to the emfield.module.
+ */
+
 define('EMVIDEO_TUDOU_MAIN_URL', 'http://www.tudou.com/');
 
 /**
@@ -146,8 +151,8 @@ function emvideo_tudou_preview($embed, $
 }
 
 function emvideo_tudou_emfield_subtheme() {
-  return array (
-  'emvideo_tudou_flash' => array (
+  return array(
+  'emvideo_tudou_flash' => array(
   'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
   'file' => 'providers/tudou.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/veoh.inc emfield/contrib/emvideo/providers/veoh.inc
--- emfield.old/contrib/emvideo/providers/veoh.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/veoh.inc	2008-09-08 13:19:13.000000000 +0200
@@ -1,6 +1,11 @@
 <?php
 // $Id: veoh.inc,v 1.1.2.2 2008/08/16 16:14:39 alexua Exp $
 
+/**
+ * @file
+ *   Provide support for the Veoh provider to the emfield.module.
+ */
+
 define('EMVIDEO_VEOH_MAIN_URL', 'http://www.veoh.com/');
 define('EMVIDEO_VEOH_API_INFO', 'http://www.veoh.com/restApiDoc/restReference.html');
 define('EMVIDEO_VEOH_API_APPLICATION_URL', 'http://www.veoh.com/developers.html');
@@ -28,8 +33,8 @@ function emvideo_veoh_settings() {
     '#type' => 'fieldset',
     '#title' => t('Veoh API'),
     '#description' => t('If you wish to be able to display Veoh thumbnails automatically, you will first need to apply for an API Developer Key from the !veoh. Note that you do not need this key to display Veoh videos themselves.', array('!veoh' => l('Veoh Developer Profile page', EMVIDEO_VEOH_API_APPLICATION_URL, array('target' => '_blank')))),
-    '#collapsible' => true,
-    '#collapsed' => true,
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
   );
   $form['veoh']['api']['emvideo_veoh_api_key'] = array(
     '#type' => 'textfield',
@@ -116,8 +121,8 @@ function emvideo_veoh_preview($embed, $w
   return $output;
 }
 function emvideo_veoh_emfield_subtheme() {
-  return array (
-  'emvideo_veoh_flash' => array (
+  return array(
+  'emvideo_veoh_flash' => array(
   'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
   'file' => 'providers/veoh.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/vimeo.inc emfield/contrib/emvideo/providers/vimeo.inc
--- emfield.old/contrib/emvideo/providers/vimeo.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/vimeo.inc	2008-09-08 13:19:25.000000000 +0200
@@ -1,6 +1,11 @@
 <?php
 // $Id: vimeo.inc,v 1.1.2.1 2008/08/10 22:22:12 alexua Exp $
 
+/**
+ * @file
+ *   Provide support for the Vimeo provider to the emfield.module.
+ */
+
 define('EMVIDEO_VIMEO_MAIN_URL', 'http://www.vimeo.com/');
 define('EMVIDEO_VIMEO_API_INFO', 'http://vimeo.com/api');
 define('EMVIDEO_VIMEO_COLOR_DEFAULT', '#01AAEA');
@@ -43,8 +48,8 @@ function emvideo_vimeo_settings() {
     '#type' => 'fieldset',
     '#title' => t('Embedded video player color'),
     '#description' => t('If allowed, this color, in hexidecimal form (#RRGGBB), will be used to change the skin of the Vimeo player.'),
-    '#collapsible' => true,
-    '#collapsed' => true,
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
   );
   $form['vimeo']['color']['emvideo_vimeo_color_override'] = array(
     '#type' => 'checkbox',
@@ -59,8 +64,8 @@ function emvideo_vimeo_settings() {
   $form['vimeo']['player_options'] = array(
     '#type' => 'fieldset',
     '#title' => t('Embedded video player options'),
-    '#collapsible' => true,
-    '#collapsed' => true,
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
   );
   $form['vimeo']['player_options']['emvideo_vimeo_on_screen_info'] = array(
     '#type' => 'checkboxes',
@@ -223,8 +228,8 @@ function emvideo_vimeo_thumbnail($field,
 }
 
 function emvideo_vimeo_emfield_subtheme() {
-  return array (
-  'emvideo_vimeo_flash' => array (
+  return array(
+  'emvideo_vimeo_flash' => array(
   'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
   'file' => 'providers/brightcove.inc'
     )
diff -urp emfield.old/contrib/emvideo/providers/youtube.inc emfield/contrib/emvideo/providers/youtube.inc
--- emfield.old/contrib/emvideo/providers/youtube.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/youtube.inc	2008-09-08 13:20:33.000000000 +0200
@@ -254,7 +254,6 @@ function theme_emvideo_youtube_flash($em
     $border = $border ? '&border=1' : '';
     $enablejsapi = isset($options['enablejsapi']) ? $options['enablejsapi'] : variable_get('emvideo_youtube_enablejsapi', TRUE);
     $enablejsapi = $enablejsapi ? '&enablejsapi=1&playerapiid=ytplayer' : '';
-    $allowScriptAcess = $enablejsapi ? 'always' : 'sameDomain';
     $id = isset($options['id']) ? $options['id'] : 'video-cck-youtube-flash-'. (++$count);
     $div_id = isset($options['div_id']) ? $options['div_id'] : 'video-cck-youtube-flash-wrapper-'. $count;
     $url = "http://www.youtube.com/v/$embed&amp;$related$autoplay_value$colors$border$enablejsap";
@@ -373,7 +372,7 @@ function emvideo_youtube_preview($embed,
  */
 function emvideo_youtube_emfield_subtheme() {
     return array(
-        'emvideo_youtube_flash'  => array (
+        'emvideo_youtube_flash'  => array(
             'arguments' => array('embed' => NULL, 'width' => NULL, 'height' => NULL, 'autoplay' => NULL),
             'file' => 'providers/youtube.inc'
         )
diff -urp emfield.old/contrib/emvideo/providers/zzz_custom_url.inc emfield/contrib/emvideo/providers/zzz_custom_url.inc
--- emfield.old/contrib/emvideo/providers/zzz_custom_url.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/contrib/emvideo/providers/zzz_custom_url.inc	2008-09-08 13:21:46.000000000 +0200
@@ -35,7 +35,7 @@ function emvideo_zzz_custom_url_settings
     'flv' => t('Flash Video (flv)'),
     'mov' => t('Quicktime (mov)'),
     'mp4' => t('Quicktime (mp4)'),
-    'rm' => 	t('Real Media (rm)'),
+    'rm' => t('Real Media (rm)'),
   );
   $form = array();
   $form['emvideo_zzz_custom_url_supported_types'] = array(
@@ -54,10 +54,10 @@ function _emvideo_zzz_custom_url_implode
 
 function emvideo_zzz_custom_url_extract($embed = '') {
   $types = _emvideo_zzz_custom_url_implode_types();
-  $baseurl = preg_quote(url(null, array('absolute' => true)), '@');
+  $baseurl = preg_quote(url(null, array('absolute' => TRUE)), '@');
 
-  return array (
-    '@' . $baseurl . '(.*' . '\.(?:' . $types . ')' . ')@i',
+  return array(
+    '@'. $baseurl .'(.*\.(?:'. $types .'))@i',
     '@(.*\.(?:'. $types .'))@i'
   );
 }
diff -urp emfield.old/emfield.cck.inc emfield/emfield.cck.inc
--- emfield.old/emfield.cck.inc	2008-09-08 13:14:22.000000000 +0200
+++ emfield/emfield.cck.inc	2008-09-08 13:22:54.000000000 +0200
@@ -87,7 +87,7 @@ function _emfield_emfield_field($op, &$n
       $items[$delta]['data'] = serialize($items[$delta]['data']);
     }
   }
-  if (isset($return)){
+  if (isset($return)) {
   return $return;
   }
 }
diff -urp emfield.old/emfield.module emfield/emfield.module
--- emfield.old/emfield.module	2008-09-08 13:14:22.000000000 +0200
+++ emfield/emfield.module	2008-09-08 13:15:24.000000000 +0200
@@ -640,7 +640,7 @@ function _emfield_handler_arg_provider($
   }
 }
 
-function emfield_provider_themes($module, $provider = null) {
+function emfield_provider_themes($module, $provider = NULL) {
   $themes = array();
   
   if ($provider && $subthemes = emfield_include_invoke($module, $provider, 'subtheme')) {