xlawrence 2005/12/06 13:59:57 CET
Modified files:
core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/plugins/JahiaImager
utils.js
core/src/webapp/jsp/jahia/htmleditors/fckeditor utils.jsp
Log:
workaround to prevent users from clicking on a folder displayed as a file by
the editor webdav tree.
Revision Changes Path
1.3 +90 -79
jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/plugins/JahiaImager/utils.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/plugins/JahiaImager/utils.js.diff?r1=1.2&r2=1.3&f=h
1.13 +5 -6
jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/utils.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/utils.jsp.diff?r1=1.12&r2=1.13&f=h
Index: utils.js
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/editor/plugins/JahiaImager/utils.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- utils.js 21 Jun 2005 14:06:23 -0000 1.2
+++ utils.js 6 Dec 2005 12:59:56 -0000 1.3
@@ -7,101 +7,112 @@
var webdavPath = "";
function Init()
{
- FCK = window.opener.FCK;
- FCKConfig = window.opener.FCKConfig;
- FCKLang = window.opener.oEditor.FCKLang;
- FCKLanguageManager = window.opener.oEditor.FCKLanguageManager;
- filesList = FCKConfig.FilesList;
-
- document.title = unescapeHtml(FCKLang.JahiaImagerDlgTitle);
-
- // First of all, translate the dialog box texts
- FCKLanguageManager.TranslatePage( document ) ;
-
- window.resizeTo(800, 600);
-
- basePath = FCKConfig.basePath;
- webdavPath = FCKConfig.webdavPath;
-
- try
- {
- filesList = eval(filesList);
- }
- catch(e){}
-
- dTree = new dTree("dTree", basePath + 'editor/plugins/JahiaImager/dTree/');
- dTree.add(1, -1, document.location.host, null, document.location.host);
-
- if(filesList)
- dTree = makeNodes(dTree, filesList, 0);
-
- // Put it in
- var ddTree = document.getElementById('dTree');
- ddTree.innerHTML = dTree.toString();
+ FCK = window.opener.FCK;
+ FCKConfig = window.opener.FCKConfig;
+ FCKLang = window.opener.oEditor.FCKLang;
+ FCKLanguageManager = window.opener.oEditor.FCKLanguageManager;
+ filesList = FCKConfig.FilesList;
+
+ document.title = unescapeHtml(FCKLang.JahiaImagerDlgTitle);
+
+ // First of all, translate the dialog box texts
+ FCKLanguageManager.TranslatePage(document);
+
+ window.resizeTo(800, 600);
+
+ basePath = FCKConfig.basePath;
+ webdavPath = FCKConfig.webdavPath;
+
+ try
+ {
+ filesList = eval(filesList);
+ }
+ catch(e) {
+ }
+
+ dTree = new dTree("dTree", basePath +
'editor/plugins/JahiaImager/dTree/');
+ dTree.add(1, -1, document.location.host, null, document.location.host);
+
+ if (filesList)
+ dTree = makeNodes(dTree, filesList, 0);
+
+ // Put it in
+ var ddTree = document.getElementById('dTree');
+ ddTree.innerHTML = dTree.toString();
}
function Set(fileUrl)
{
- try
- {
- window.opener.SetUrl(fileUrl);
- }
- catch(e){}
+ try
+ {
+ window.opener.SetUrl(fileUrl);
+ }
+ catch(e) {
+ }
- window.close();
+ window.close();
}
-function onCancel() // cancel selection
+function onCancel() // cancel selection
{
- window.close();
- return false;
+ window.close();
+ return false;
}
function makeNodes(dTree, files, parent)
{
- html = "";
- var levels = new Array();
- for(var i = 0; i < files.length; i++)
- {
- var id = files[i][1] + 1;
- var parentId = files[i][0];
- var fileName = files[i][2];
- var fileUrl = files[i][3];
- var currentParent = levels[parentId - 1];
- if(!currentParent)
- {
- currentParent = parent;
- }
-
- if(!fileName)
+ html = "";
+ var levels = new Array();
+ for (var i = 0; i < files.length; i++)
{
- fileName = "";
+ var id = files[i][1] + 1;
+ var parentId = files[i][0];
+ var fileName = files[i][2];
+ var fileUrl = files[i][3];
+ var currentParent = levels[parentId - 1];
+ if (!currentParent)
+ {
+ currentParent = parent;
+ }
+
+ if (!fileName) {
+ fileName = "";
+ }
+
+ //html += id + " = " + currentParent + "\n";
+ if (fileUrl.indexOf(".") > -1 &&
+ (fileUrl.indexOf(".gif") > -1 ||
+ fileUrl.indexOf(".jpg") > -1 ||
+ fileUrl.indexOf(".jpe") > -1 ||
+ fileUrl.indexOf(".png") > -1 ||
+ fileUrl.indexOf(".bmp") > -1 ||
+ fileUrl.indexOf(".tif") > -1)) {
+
+ dTree.add(id, currentParent,
+ fileName.replace(/^.*\//, ''),
+ 'javascript:Set(decodeURIComponent(\'' +
encodeURIComponent(webdavPath + fileUrl) + '\'));void(0);',
+ fileName);
+ } else {
+ dTree.add(id, currentParent, fileName.replace(/^.*\//, ''),
null, fileName);
+ }
+ levels[parentId] = id;
}
-
- //html += id + " = " + currentParent + "\n";
- dTree.add(id, currentParent,
- fileName.replace(/^.*\//, ''),
- 'javascript:Set(decodeURIComponent(\'' +
encodeURIComponent(webdavPath + fileUrl) + '\'));void(0);',
- fileName);
- levels[parentId] = id;
-
- }
- return dTree;
+ return dTree;
}
function unescapeHtml(string)
{
- if(string)
- {
- var specialsCharHtml =
['À','Á','Â','Ã','Ä','Å','Æ','Ç','Egrave;','É','Ê','Ë','Ì','Í','Î','Ï','à','á','â','ã','ä','å','æ','ç','è','é','ê','ë','ì','í','î','ï'];
- var specialsChar =
['?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?'];
- for(var i = 0; i < specialsCharHtml.length; i++)
- {
- while (string.indexOf(specialsCharHtml[i]) >= 0)
- {
- string = string.replace(specialsCharHtml[i], specialsChar[i]);
- }
- }
- }
- return string;
+ if (string)
+ {
+ var specialsCharHtml =
['À','Á','Â','Ã','Ä','Å','Æ','Ç','Egrave;','É','Ê','Ë','Ì','Í','Î','Ï','à','á','â','ã','ä','å','æ','ç','è','é','ê','ë','ì','í','î','ï'];
+ var specialsChar =
['?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?','?'];
+ for (var i = 0; i < specialsCharHtml.length; i++)
+ {
+ while (string.indexOf(specialsCharHtml[i]) >= 0)
+ {
+ string = string.replace(specialsCharHtml[i],
specialsChar[i]);
+ }
+ }
+ }
+ return string;
}
Index: utils.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/utils.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- utils.jsp 11 Nov 2005 13:32:45 -0000 1.12
+++ utils.jsp 6 Dec 2005 12:59:57 -0000 1.13
@@ -30,8 +30,8 @@
final String[] defaultFileExt = {"jpg", "jpeg", "jpe", "gif", "bmp", "png",
"tif", "tiff"};
int counterOperations = 1;
-final String[] pathSearch = {"users", "shared", "private", "public"};
-final String[] pathReplace = {"utilisateurs", "partagé",
"privé", "publique"};
+final String[] pathSearch = {"users", "shared", "private", "public",
"groups", "members"};
+final String[] pathReplace = {"utilisateurs", "partagé",
"privé", "publique", "groupes", "membres"};
final ArrayList excludeList = new ArrayList();
final StringBuffer buff = new StringBuffer();
@@ -105,9 +105,8 @@
pathDisplay = pathDisplay.replaceAll("'", "\\\'");
-
buff.append("[").append(level).append(",").append(counterOperations)
-
.append(",\'").append(pathDisplay).append("\','").append(expand)
- .append("'],");
+
buff.append("[").append(level).append(",").append(counterOperations).
+
append(",\'").append(pathDisplay).append("\','").append(expand).append("'],");
counterOperations++;
}
@@ -202,7 +201,7 @@
buff.append("[[0,0,\'root\','/'],");
excludeList.add("actions");
excludeList.add("mygroups");
- excludeList.add("groups");
+ //excludeList.add("groups");
excludeList.add("content");
final DAVFileAccess df =
JahiaWebdavBaseService.getInstance().getDAVFileAccess(jParams, "/");
buff.append(expandOne(df, 1, lang));
