[geeklog-hg] geeklog: Now Filemanager shows the Image/File/Flash folder when ...

[geeklog-cvs at lists.geeklog.net]

changeset 9445:767d8847b296
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/767d8847b296
user: Kenji ITO <mystralkk at gmail.com>
date: Thu Jan 23 12:25:26 2014 +0900
description:
Now Filemanager shows the Image/File/Flash folder when the user clicks respective buttons

diffstat:

 public_html/admin/install/index.php        |  13 +++++++++++--
 public_html/editors/ckeditor/config.js     |   5 ++++-
 public_html/editors/fckeditor/fckconfig.js |  16 +++++++++-------
 public_html/lib-common.php                 |   2 +-
 4 files changed, 25 insertions(+), 11 deletions(-)

diffs (82 lines):

diff -r e98a50934dcd -r 767d8847b296 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Thu Jan 23 12:22:26 2014 +0900
+++ b/public_html/admin/install/index.php	Thu Jan 23 12:25:26 2014 +0900
@@ -1136,8 +1136,17 @@
                                 $_PATH['public_html/'] . 'images/topics/',
                                 $_PATH['public_html/'] . 'images/userphotos',
                                 $_PATH['public_html/'] . 'filemanager/scripts/filemanager.config.js',
-                                $_PATH['public_html/'] . 'images/library/_thumbs/Image/',
-                                $_PATH['public_html/'] . 'images/library/_thumbs/Image/icons/');
+                                $_PATH['public_html/'] . 'images/library/File/',
+                                $_PATH['public_html/'] . 'images/library/Flash/',
+                                $_PATH['public_html/'] . 'images/library/Image/',
+                                $_PATH['public_html/'] . 'images/library/Image/_thumbs/',
+                                $_PATH['public_html/'] . 'images/library/Image/icons/',
+                                $_PATH['public_html/'] . 'images/library/Media/',
+                                $_PATH['public_html/'] . 'images/_thumbs/',
+                                $_PATH['public_html/'] . 'images/_thumbs/articles/',
+                                $_PATH['public_html/'] . 'images/_thumbs/library/Image/',
+                                $_PATH['public_html/'] . 'images/_thumbs/userphotos/',
+			);
 
             if (!isset($_CONF['allow_mysqldump']) && $_DB_dbms == 'mysql') {
                 array_splice($file_list, 1, 0, $gl_path . 'backups/');
diff -r e98a50934dcd -r 767d8847b296 public_html/editors/ckeditor/config.js
--- a/public_html/editors/ckeditor/config.js	Thu Jan 23 12:22:26 2014 +0900
+++ b/public_html/editors/ckeditor/config.js	Thu Jan 23 12:25:26 2014 +0900
@@ -81,5 +81,8 @@
 	];
 
 	// Filemanager
-	config.filebrowserBrowseUrl = geeklog.site_url + '/filemanager/index.php';
+	config.filebrowserBrowseUrl = geeklog.site_url + '/filemanager/index.php?Type=File';
+//	config.filebrowserBrowseUrl = geeklog.site_url + '/filemanager/index.php?Type=Media';
+	config.filebrowserImageBrowseUrl = geeklog.site_url + '/filemanager/index.php?Type=Image';
+	config.filebrowserFlashBrowseUrl = geeklog.site_url + '/filemanager/index.php?Type=Flash';
 };
diff -r e98a50934dcd -r 767d8847b296 public_html/editors/fckeditor/fckconfig.js
--- a/public_html/editors/fckeditor/fckconfig.js	Thu Jan 23 12:22:26 2014 +0900
+++ b/public_html/editors/fckeditor/fckconfig.js	Thu Jan 23 12:25:26 2014 +0900
@@ -325,21 +325,23 @@
 FCKConfig.PreventSubmitHandler = false ;
 
 // Filemanager integration
+// NOTE: if you would like to use the original file browser shipped with FCKeditor,
+// please comment out the following lines.
 (function () {
 	var filemanagerUrl = FCKConfig.BasePath.replace(/\/editors\/fckeditor\/editor\/$/, '') + '/filemanager/index.php';
-	
+
 	if (FCKConfig.FlashBrowser && (FCKConfig.FlashBrowser === true)) {
-		FCKConfig.FlashBrowserURL = filemanagerUrl;
+		FCKConfig.FlashBrowserURL = filemanagerUrl + '?Type=Flash';
 	}
-	
+
 	if (FCKConfig.ImageBrowser && (FCKConfig.ImageBrowser === true)) {
-		FCKConfig.ImageBrowserURL = filemanagerUrl;
+		FCKConfig.ImageBrowserURL = filemanagerUrl + '?Type=Image';
 	}
-	
+
 	if (FCKConfig.LinkBrowser && (FCKConfig.LinkBrowser === true)) {
-		FCKConfig.LinkBrowserURL = filemanagerUrl;
+		FCKConfig.LinkBrowserURL = filemanagerUrl + '?Type=File';
 	}
-	
+
 	// You can upload files from within the Filemanager, so "Upload" tabs in
 	// FCKeditor dialogs are unnecessary.
 	FCKConfig.FlashUpload = false;
diff -r e98a50934dcd -r 767d8847b296 public_html/lib-common.php
--- a/public_html/lib-common.php	Thu Jan 23 12:22:26 2014 +0900
+++ b/public_html/lib-common.php	Thu Jan 23 12:25:26 2014 +0900
@@ -3667,7 +3667,7 @@
                         'num' => '', 
                         'image' => $_CONF['layout_url'] . '/images/icons/log_viewer.' . $_IMAGE_TYPE),
                     array('condition' => SEC_inGroup('Root'),
-                        'url' => $_CONF['site_url'] . '/filemanager/index.php',
+                        'url' => $_CONF['site_url'] . '/filemanager/index.php?Type=Root',
                         'lang' => $LANG01['filemanager'],
                         'num' => '', 
                         'image' => $_CONF['layout_url'] . '/images/icons/filemanager.' . $_IMAGE_TYPE,