Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ckeditor/README.txt,v
retrieving revision 1.3
diff -u -p -r1.3 README.txt
--- README.txt	4 Dec 2009 21:17:57 -0000	1.3
+++ README.txt	17 Jun 2010 23:53:46 -0000
@@ -196,6 +196,35 @@ CKFinder is an AJAX based file manager c
       (in selected CKEditor profile scroll down to "File browser settings" section).
       In the "File browser settings" section you may also change destination folders for files uploaded with CKFinder.
 
+ How to install JASFinder
+------------------------
+JASFinder is an AJAX based file manager: http://sourceforge.net/projects/jasfinder/. It still has no release versions,
+but the code in the CVS repository is being used and has so far been quite well working.
+
+Installation is mostly the same as CKFinder above, except the changes to JASFinder configuration file 
+(sites/all/modules/ckeditor/jasfinder/connectors/php/config.php:
+
+Add: 
+
+require_once '../../../includes/filemanager.config.php';
+
+below the following line:
+
+$Config['Enabled'] = false ;
+
+Also, below these lines, change these two lines to this form:
+
+$Config['UserFilesPath'] = $baseUrl;
+
+and
+
+$Config['UserFilesAbsolutePath'] = $baseDir ;
+
+Otherwise do as you would with CKFinder. Use CKFinder path fields in the CKEditor configuration page to define
+used upload paths.
+
+Note: You probably need to set your $cookie_domain in your settings.php!
+
 Modules: Link to content (EXPERIMENTAL)
 ---------------------------------------
 Link to content module can be integrated with CKEditor.
Index: ckeditor.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ckeditor/ckeditor.module,v
retrieving revision 1.4
diff -u -p -r1.4 ckeditor.module
--- ckeditor.module	8 Dec 2009 08:06:21 -0000	1.4
+++ ckeditor.module	17 Jun 2010 23:53:47 -0000
@@ -79,6 +79,9 @@ function ckeditor_perm() {
   if (file_exists(drupal_get_path('module', 'ckeditor') . "/ckfinder")) {
     $arr[] = 'allow CKFinder file uploads';
   }
+  if (file_exists(drupal_get_path('module', 'ckeditor') . "/jasfinder")) {
+    $arr[] = 'allow JASFinder file uploads';
+  }
   return $arr;
 }
 
@@ -666,6 +669,28 @@ function ckeditor_process_textarea($elem
         }
       }
     }
+    if ($filebrowser == 'jasfinder' || $filebrowser_image == 'jasfinder' || $filebrowser_flash == 'jasfinder') {
+      if (user_access('allow JASFinder file uploads')) {
+        if (!empty($profile->settings['UserFilesPath'])) {
+          $_SESSION['ckeditor']['UserFilesPath'] = strtr($profile->settings['UserFilesPath'], array("%f" => file_directory_path(), "%u" => $user->uid, "%b" => $host, "%n" => $user->name));
+        }
+        if (!empty($profile->settings['UserFilesAbsolutePath'])) {
+          $_SESSION['ckeditor']['UserFilesAbsolutePath'] = strtr($profile->settings['UserFilesAbsolutePath'], array("%f" => file_directory_path(), "%u" => $user->uid, "%b" => base_path(), "%d" => $_SERVER['DOCUMENT_ROOT'], "%n" => $user->name));
+        }
+        if (variable_get('file_downloads', '') == FILE_DOWNLOADS_PRIVATE) {
+          $private_dir = isset($global_profile->settings['private_dir']) ? trim($global_profile->settings['private_dir'], '\/') : '';
+          if (!empty($private_dir)) {
+            $private_dir = strtr($private_dir, array('%u' => $user->uid, '%n' => $user->name));
+            $_SESSION['ckeditor']['UserFilesPath'] = url('system/files') .'/'. $private_dir .'/';
+            $_SESSION['ckeditor']['UserFilesAbsolutePath'] = realpath(file_directory_path()) . DIRECTORY_SEPARATOR . $private_dir . DIRECTORY_SEPARATOR;
+          }
+          else {
+            $_SESSION['ckeditor']['UserFilesPath'] = url('system/files') .'/';
+            $_SESSION['ckeditor']['UserFilesAbsolutePath'] = realpath(file_directory_path()) . DIRECTORY_SEPARATOR;
+          }
+        }
+      }
+    }
 
     switch ($filebrowser) {
       case 'ckfinder':
@@ -678,6 +703,16 @@ function ckeditor_process_textarea($elem
           $settings[$textarea_id]['filebrowserFlashUploadUrl'] = $module_full_path .'/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash';
         }
         break;
+      case 'jasfinder':
+        if (user_access('allow JASFinder file uploads')) {
+          $settings[$textarea_id]['filebrowserBrowseUrl'] = $module_full_path .'/jasfinder/';
+//           $settings[$textarea_id]['filebrowserImageBrowseUrl'] = $module_full_path .'/jasfinder/?Type=Images';
+//           $settings[$textarea_id]['filebrowserFlashBrowseUrl'] = $module_full_path .'/jasfinder/?Type=Flash';
+//           $settings[$textarea_id]['filebrowserUploadUrl'] = $module_full_path .'/jasfinder/core/connector/php/connector.php?command=QuickUpload&type=Files';
+//           $settings[$textarea_id]['filebrowserImageUploadUrl'] = $module_full_path .'/jasfinder/core/connector/php/connector.php?command=QuickUpload&type=Images';
+//           $settings[$textarea_id]['filebrowserFlashUploadUrl'] = $module_full_path .'/jasfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash';
+        }
+        break;
       case 'imce':
         $settings[$textarea_id]['filebrowserBrowseUrl'] = $host ."index.php?q=imce&app=ckeditor|sendto@ckeditor_fileUrl|";
         break;
@@ -703,6 +738,12 @@ function ckeditor_process_textarea($elem
             $settings[$textarea_id]['filebrowserImageUploadUrl'] = $module_full_path .'/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images';
           }
           break;
+        case 'jasfinder':
+          if (user_access('allow JASFinder file uploads')) {
+            $settings[$textarea_id]['filebrowserImageBrowseUrl'] = $module_full_path .'/jasfinder/?Type=Images';
+//             $settings[$textarea_id]['filebrowserImageUploadUrl'] = $module_full_path .'/jasfinder/core/connector/php/connector.php?command=QuickUpload&type=Images';
+          }
+          break;
         case 'imce':
           $settings[$textarea_id]['filebrowserImageBrowseUrl'] = $host ."index.php?q=imce&app=ckeditor|sendto@ckeditor_fileUrl|";
           break;
@@ -729,6 +770,12 @@ function ckeditor_process_textarea($elem
             $settings[$textarea_id]['filebrowserFlashUploadUrl'] = $module_full_path .'/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images';
           }
           break;
+        case 'jasfinder':
+          if (user_access('allow JASFinder file uploads')) {
+            $settings[$textarea_id]['filebrowserFlashBrowseUrl'] = $module_full_path .'/jasfinder/?Type=Images';
+//             $settings[$textarea_id]['filebrowserFlashUploadUrl'] = $module_full_path .'/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images';
+          }
+          break;
         case 'imce':
           $settings[$textarea_id]['filebrowserFlashBrowseUrl'] = $host ."index.php?q=imce&app=ckeditor|sendto@ckeditor_fileUrl|";
           break;
Index: includes/ckeditor.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ckeditor/includes/ckeditor.admin.inc,v
retrieving revision 1.2
diff -u -p -r1.2 ckeditor.admin.inc
--- includes/ckeditor.admin.inc	4 Dec 2009 22:10:22 -0000	1.2
+++ includes/ckeditor.admin.inc	17 Jun 2010 23:53:48 -0000
@@ -648,11 +648,13 @@ function ckeditor_admin_profile_form($fo
   $filebrowsers = array(
     'none' => t('None'),
     'ckfinder' => t('CKFinder'),
+    'jasfinder' => t('JASFinder'),
   );
 
   $filebrowsers_dialogs = array(
     '' => t('Same as in Link dialog'),
     'ckfinder' => t('CKFinder'),
+    'ckfinder' => t('JASFinder'),
   );
 
   if (module_exists('imce')) {
Index: includes/filemanager.config.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ckeditor/includes/filemanager.config.php,v
retrieving revision 1.1
diff -u -p -r1.1 filemanager.config.php
--- includes/filemanager.config.php	4 Dec 2009 20:36:57 -0000	1.1
+++ includes/filemanager.config.php	17 Jun 2010 23:53:48 -0000
@@ -66,7 +66,7 @@ function CheckAuthentication() {
       chdir($drupal_path);
       require_once './includes/bootstrap.inc';
       drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-      $authenticated = user_access('allow CKFinder file uploads');
+      $authenticated = user_access('allow JASFinder file uploads');
       if (isset($_SESSION['ckeditor']['UserFilesPath'], $_SESSION['ckeditor']['UserFilesAbsolutePath'])) {
         $GLOBALS['ckfinder_user_files_path'] = $_SESSION['ckeditor']['UserFilesPath'];
         $GLOBALS['ckfinder_user_files_absolute_path'] = $_SESSION['ckeditor']['UserFilesAbsolutePath'];
@@ -78,7 +78,7 @@ function CheckAuthentication() {
   return $authenticated;
 }
 
-CheckAuthentication();
+$Config['Enabled'] = CheckAuthentication();
 
 if (!empty($ckfinder_user_files_path)) {
   $baseUrl = $ckfinder_user_files_path;