--- flashvideo_streaming.module	2009-02-15 01:13:58.000000000 +0100
+++ flashvideo_streaming.new	2009-02-20 10:38:05.000000000 +0100
@@ -90,18 +90,12 @@ function flashvideo_streaming_form_alter
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
     );
-    $form['flashvideo_streaming']['flashvideo_xmoov']['flashvideo_'. $node_type .'_xmoov_userootpath'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Output Directories reference from Drupal Root.'),
-      '#default_value' => flashvideo_variable_get($node_type, 'xmoov_userootpath', 0),
-      '#description' => t('Checking this checkbox will force all the output directories to be referenced from the root of the Drupal path instead of the files directory.'),
-    );
     $form['flashvideo_streaming']['flashvideo_xmoov']['flashvideo_'. $node_type .'_xmoov_path'] = array(
-       '#title' => t('File Path to xmoov-php Script'),
+       '#title' => t('Path to xmoov-php script'),
        '#type' => 'textfield',
        '#default_value' => flashvideo_variable_get($node_type, 'xmoov_path', ''),
        '#maxlength' => 128,
-       '#description' => t('The path to your xmoov-php.php script.<br />Examples: <strong>files/xmoov-php.php</strong> -OR- <strong>xmoov-php.php</strong>'),
+       '#description' => t('The path to your xmoov-php.php script.').'<br />'.t('Example').': <strong>sites/modules/flashvideo/xmoov.php</strong>. '.t('Note, the files directory is not allowed to execute PHP-files.'),
        '#required' => $form_state['values']['flashvideo_streaming']['flashvideo_'. $node_type .'_streaming_enable'] && $form_state['values']['flashvideo_streaming']['flashvideo_'. $node_type .'_streaming_method'] == FLASHVIDEO_STREAMING_METHOD_XMOOV ? TRUE : FALSE,
     );
     $form['#validate'][] = '_flashvideo_streaming_admin_validate';
@@ -112,18 +106,14 @@ function _flashvideo_streaming_admin_val
   $node_type = $form['#parameters'][2];
 
   if ($form_state['values']['flashvideo_'. $node_type .'_streaming_enable'] && $form_state['values']['flashvideo_'. $node_type .'_streaming_method'] == FLASHVIDEO_STREAMING_METHOD_XMOOV) {
-
-    // Set the path to the streamer based on if they want to use the Drupal root or not.
-    $useroot = $form_state['values']['flashvideo_'. $node_type .'_xmoov_userootpath'];
     $user_path = $form_state['values']['flashvideo_'. $node_type .'_xmoov_path'];
-    $xmoov_path = $useroot ? base_path() . $user_path : file_directory_path() .'/'. $user_path;
 
     // If we are using xmoov-php, check the xmoov path to make sure it exists.
-    if (!file_exists(getcwd() . $xmoov_path)) {
-      form_set_error('flashvideo_'. $node_type .'_xmoov_path', "Can not find xmoov-php at ". $xmoov_path);
+    if (!file_exists(getcwd() ."/". $user_path)) {
+      form_set_error('flashvideo_'. $node_type .'_xmoov_path', "Can not find xmoov-php at ". getcwd()."/".$user_path);
     }
-    $form_state['values']['flashvideo_'. $node_type .'_streamer'] = $xmoov_path;
     $form_state['values']['flashvideo_'. $node_type .'_xmoov_path'] = $user_path;
+    $form_state['values']['flashvideo_'. $node_type .'_streamer'] = base_path().$user_path;
   }
 }
 
@@ -199,7 +189,7 @@ function flashvideo_streaming_flashvideo
   }
   // xmoov-php process:
   elseif (flashvideo_variable_get($node_type, 'streaming_enable', 0) && flashvideo_variable_get($node_type, 'streaming_method', 0) == FLASHVIDEO_STREAMING_METHOD_XMOOV) {
-    if (!variable_get('flashvideo_xmoov_path', 0)) {
+    if (!flashvideo_variable_get($node_type,  'xmoov_path', 0)) {
       return array(); // User doesn't want to do streaming "gets".
     }
 
@@ -258,4 +248,4 @@ function flashvideo_streaming_flashvideo
   else {
     return array();
   }
-}
\ No newline at end of file
+}