Binary files /Users/luislopez/Downloads/ckeditor/.DS_Store and /Users/luislopez/Sites/drupal7/sites/all/modules/ckeditor/.DS_Store differ
diff -rupN /Users/luislopez/Downloads/ckeditor/includes/ckeditor.admin.inc /Users/luislopez/Sites/drupal7/sites/all/modules/ckeditor/includes/ckeditor.admin.inc
--- /Users/luislopez/Downloads/ckeditor/includes/ckeditor.admin.inc 2011-01-13 10:15:12.000000000 -0800
+++ /Users/luislopez/Sites/drupal7/sites/all/modules/ckeditor/includes/ckeditor.admin.inc 2011-02-07 17:09:14.000000000 -0800
@@ -721,7 +721,7 @@ function ckeditor_admin_profile_form($fo
'#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. CKEditor is compatible with contributed modules like IMCE, Image Browser or Web File Manager. CKEditor can be also integrated with CKFinder.', 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/ckeditor'), '!ckfinder' => url('http://ckfinder.com')))
- '#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. CKEditor is compatible with contributed modules like IMCE. CKEditor can be also integrated with CKFinder.', array('!imce' => url('http://drupal.org/project/imce'), '!readme' => url('admin/help/ckeditor'), '!ckfinder' => url('http://ckfinder.com')))
+ '#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. CKEditor is compatible with contributed modules like IMCE, Image Browser, Web File Manager or elFinder. CKEditor can be also integrated with CKFinder.', 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/ckeditor'), '!ckfinder' => url('http://ckfinder.com'), '!elfinder' => url('http://drupal.org/project/elfinder')))
);
$filebrowsers = array(
@@ -754,6 +754,11 @@ function ckeditor_admin_profile_form($fo
$filebrowsers_dialogs['webfm'] = t('Web File Manager');
}
*/
+ if (module_exists('elfinder')) {
+ $filebrowsers['elfinder'] = t('elFinder');
+ $filebrowsers_dialogs['elfinder'] = t('elFinder');
+ }
+
$form['ckeditor_upload_settings']['filebrowser'] = array(
'#type' => 'select',
'#title' => t('File browser type (Link dialog)'),
diff -rupN /Users/luislopez/Downloads/ckeditor/includes/ckeditor.lib.inc /Users/luislopez/Sites/drupal7/sites/all/modules/ckeditor/includes/ckeditor.lib.inc
--- /Users/luislopez/Downloads/ckeditor/includes/ckeditor.lib.inc 2011-02-02 23:52:00.000000000 -0800
+++ /Users/luislopez/Sites/drupal7/sites/all/modules/ckeditor/includes/ckeditor.lib.inc 2011-02-07 17:33:44.000000000 -0800
@@ -572,6 +572,10 @@ function ckeditor_profile_settings_compi
if ($filebrowser == 'imce' && !module_exists('imce')) {
$filebrowser = 'none';
}
+
+ if ($filebrowser == 'elfinder' && !module_exists('elfinder')) {
+ $filebrowser = 'none';
+ }
/* MODULES NOT PORTED TO D7
if ($filebrowser == 'tinybrowser' && !module_exists('tinybrowser')) {
$filebrowser = 'none';
@@ -588,6 +592,10 @@ function ckeditor_profile_settings_compi
if ($filebrowser_image == 'imce' && !module_exists('imce')) {
$filebrowser_image = $filebrowser;
}
+
+ if ($filebrowser_image == 'elfinder' && !module_exists('elfinder')) {
+ $filebrowser_image = $filebrowser;
+ }
/* MODULES NOT PORTED TO D7
if ($filebrowser_image == 'tinybrowser' && !module_exists('tinybrowser')) {
$filebrowser_image = $filebrowser;
@@ -605,6 +613,9 @@ function ckeditor_profile_settings_compi
if ($filebrowser_flash == 'imce' && !module_exists('imce')) {
$filebrowser_flash = $filebrowser;
}
+ if ($filebrowser_flash == 'elfinder' && !module_exists('elfinder')) {
+ $filebrowser_flash = $filebrowser;
+ }
/* MODULES NOT PORTED TO D7
if ($filebrowser_image == 'tinybrowser' && !module_exists('tinybrowser')) {
$filebrowser_flash = $filebrowser;
@@ -672,6 +683,9 @@ function ckeditor_profile_settings_compi
case 'imce':
$settings['filebrowserBrowseUrl'] = url('imce', array('query' => array('app' => 'ckeditor|sendto@ckeditor_imceSendTo|')));
break;
+ case 'elfinder':
+ $settings['filebrowserBrowseUrl'] = $host ."index.php?q=elfinder&app=ckeditor";
+ break;
/* MODULES NOT PORTED TO D7
case 'webfm':
if (user_access('access webfm')) {
@@ -704,6 +718,9 @@ function ckeditor_profile_settings_compi
case 'imce':
$settings['filebrowserImageBrowseUrl'] = url('imce', array('query' => array('app' => 'ckeditor|sendto@ckeditor_imceSendTo|')));
break;
+ case 'elfinder':
+ $settings[$textarea_id]['filebrowserImageBrowseUrl'] = $host ."index.php?q=elfinder&app=ckeditor";
+ break;
/* MODULES NOT PORTED TO D7
case 'webfm':
if (user_access('access webfm')) {
@@ -737,6 +754,9 @@ function ckeditor_profile_settings_compi
case 'imce':
$settings['filebrowserFlashBrowseUrl'] = url('imce', array('query' => array('app' => 'ckeditor|sendto@ckeditor_imceSendTo|')));
break;
+ case 'elfinder':
+ $settings[$textarea_id]['filebrowserFlashBrowseUrl'] = $host ."index.php?q=elfinder&app=ckeditor";
+ break;
/* MODULES NOT PORTED TO D7
case 'webfm':
if (user_access('access webfm')) {
Binary files /Users/luislopez/Downloads/ckeditor/plugins/.DS_Store and /Users/luislopez/Sites/drupal7/sites/all/modules/ckeditor/plugins/.DS_Store differ
Binary files /Users/luislopez/Downloads/ckeditor/plugins/imce/.DS_Store and /Users/luislopez/Sites/drupal7/sites/all/modules/ckeditor/plugins/imce/.DS_Store differ