|
@@ -144,7 +158,7 @@
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html
===================================================================
diff -u -r5055 -r6855
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html (.../frmresourceslist.html) (revision 5055)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/frmresourceslist.html (.../frmresourceslist.html) (revision 6855)
@@ -194,14 +194,18 @@
document.getElementById("context_menu").style.display = "none";
}
-function RenameFromContextMenu() {
- file_name = document.getElementById("context_menu_file").value;
+function RenameFromContextMenu(old_name) {
+ if (old_name)
+ file_name = old_name;
+ else
+ file_name = document.getElementById("context_menu_file").value;
f=prompt('Rename file "'+file_name+'"?',file_name);
if (f) {
RenameFile(file_name,f);
}
}
+
function DeleteFromContextMenu() {
file_name = document.getElementById("context_menu_file").value;
f=confirm('Delete file "'+file_name+'"?',file_name);
@@ -241,9 +245,29 @@
window.top.opener.focus() ;
}
+
+function ValidateFileName(file_name)
+{
+ var sp = file_name.replace(/\\/g, '\/');
+ sp=sp.split("/");
+ file_name = sp[sp.length-1];
+ var re = /^([\/a-zA-Z0-9\(\)_\.-]+)$/
+
+ if (!re.test(file_name)) {
+ alert('Please name your files to be web-friendly. We recommend using only these characters in file names:'+"\n"+
+ 'Letters a-z, A-Z, Numbers 0-9, "_" (underscore), "-" (dash), " " (space), "." (period)'+"\n"+
+ 'Please avoid using any other characters like quotes, brackets, quotation marks, "?", "!", "=", foreign symbols, etc.');
+ return false;
+ } else
+ return true;
+}
+
function RenameFile(old_name,new_name)
{
- oConnector.SendCommand( 'RenameFile_'+old_name+'|'+new_name, null, RenameCallBack );
+ if (ValidateFileName(new_name))
+ oConnector.SendCommand( 'RenameFile_'+old_name+'|'+new_name, null, RenameCallBack );
+ else
+ RenameFromContextMenu(old_name);
}
function DeleteFiles(confirm)
|