Index: fckeditor.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/fckeditor/Attic/fckeditor.admin.inc,v
retrieving revision 1.1.2.32
diff -u -p -r1.1.2.32 fckeditor.admin.inc
--- fckeditor.admin.inc	23 Jan 2009 15:02:19 -0000	1.1.2.32
+++ fckeditor.admin.inc	21 Feb 2009 06:49:46 -0000
@@ -610,7 +610,7 @@ function fckeditor_admin_profile_form($f
     '#title' => t('File browser settings'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#description' => t('Set file browser settings. A file browser will allow you to explore the files contained on the server and embed them as links, images or flash movies. Besides the built-in FCKeditor file browser, you can also use a contributed module like <a href="!imce">IMCE</a> or <a href="!ib">Image Browser</a>. The quick upload setting controls whether images, flash movies and files can be uploaded using the upload tab of the respective dialogs. Please note that these options require manual configuration, check <a href="!readme">readme.txt</a> for more information.', array('!imce' => url('http://drupal.org/project/imce'), '!ib' => url('http://drupal.org/project/imagebrowser'), '!readme' => url('admin/help/fckeditor')))
+    '#description' => t('Set file browser settings. A file browser will allow you to explore the files contained on the server and embed them as links, images or flash movies. Besides the built-in FCKeditor file browser, you can also use a contributed module like <a href="!imce">IMCE</a>, <a href="!ib">Image Browser</a> or <a href="!webfm">Web File Manager</a>. The quick upload setting controls whether images, flash movies and files can be uploaded using the upload tab of the respective dialogs. Please note that these options require manual configuration, check <a href="!readme">readme.txt</a> for more information.', array('!imce' => url('http://drupal.org/project/imce'), '!ib' => url('http://drupal.org/project/imagebrowser'), '!webfm' => url('http://drupal.org/project/webfm'), '!readme' => url('admin/help/fckeditor')))
   );
 
   $filebrowsers = array(
@@ -625,6 +625,10 @@ function fckeditor_admin_profile_form($f
   if (module_exists('imagebrowser')) {
     $filebrowsers['ib'] = t('Image Browser');
   }
+  
+  if (module_exists('webfm_popup')) {
+    $filebrowsers['webfm'] = t('Web File Manager');
+  }
 
   $form['fckeditor_upload_settings']['filebrowser'] = array(
     '#type' => 'select',
Index: fckeditor.help.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/fckeditor/Attic/fckeditor.help.inc,v
retrieving revision 1.1.2.12
diff -u -p -r1.1.2.12 fckeditor.help.inc
--- fckeditor.help.inc	23 Jan 2009 15:02:19 -0000	1.1.2.12
+++ fckeditor.help.inc	21 Feb 2009 06:49:46 -0000
@@ -100,7 +100,7 @@ function fckeditor_help_delegate($path, 
       $output .= '<p>'. t('There are three ways for uploading files:') .'</p>';
       $output .= '<ol>';
       $output .= '<li>'. t('By using the built-in file browser.') .'</li>';
-      $output .= '<li>'. t('By using a module like <a href="!imce">IMCE</a> or <a href="!ib">Image Browser</a>.', array('!imce' => 'http://drupal.org/project/imce', '!ib' => 'http://drupal.org/project/imagebrowser')) .'</li>';
+      $output .= '<li>'. t('By using a module like <a href="!imce">IMCE</a>, <a href="!ib">Image Browser</a> or <a href="!webfm">Web File Manager</a>.', array('!imce' => 'http://drupal.org/project/imce', '!ib' => 'http://drupal.org/project/imagebrowser', '!webfm' => 'http://drupal.org/project/webfm')) .'</li>';
       $output .= '<li>'. t('By using the core upload module.') .'</li>';
       $output .= '</ol>';
 
Index: fckeditor.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/fckeditor/fckeditor.module,v
retrieving revision 1.20.2.34.2.66
diff -u -p -r1.20.2.34.2.66 fckeditor.module
--- fckeditor.module	19 Feb 2009 12:50:55 -0000	1.20.2.34.2.66
+++ fckeditor.module	21 Feb 2009 06:49:46 -0000
@@ -635,6 +635,9 @@ function fckeditor_process_textarea($ele
       if ($filebrowser == 'ib' && !module_exists('imagebrowser')) {
         $filebrowser = 'none';
       }
+      if ($filebrowser == 'webfm' && !module_exists('webfm_popup')) {
+        $filebrowser = 'none';
+      }
       $quickupload = (!empty($conf['quickupload']) && $conf['quickupload'] == 't');
 
       // load variables used by both quick upload and filebrowser
@@ -713,6 +716,15 @@ function fckeditor_process_textarea($ele
           $js .= $js_id .".Config['LinkBrowserWindowWidth']= '680';";
           $js .= $js_id .".Config['LinkBrowserWindowHeight'] = '439';";
           break;
+        
+        case 'webfm':
+          $js .= $js_id .".Config['LinkBrowser']= true;\n";
+          $js .= $js_id .".Config['ImageBrowser']= true;\n";
+          $js .= $js_id .".Config['FlashBrowser']= true;\n";
+          $js .= $js_id .".Config['LinkBrowserURL']= '". $host ."?q=webfm_popup&url=txtUrl';\n";
+          $js .= $js_id .".Config['ImageBrowserURL']= '". $host ."?q=webfm_popup&url=txtUrl';\n";
+          $js .= $js_id .".Config['FlashBrowserURL']= '". $host ."?q=webfm_popup&url=txtUrl';\n";
+          break;
 
         default:
         case 'none':