Merge pull request #247 from joni2back/master

Supporting extension changes
simogeo · Apr 9, 2014 · 74f36c1 · 74f36c1
2 parents ff291ba + acc6547
commit 74f36c1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/scripts/filemanager.config.js.default b/scripts/filemanager.config.js.default
@@ -24,6 +24,7 @@
         "plugins": []
     },
     "security": {
+        "allowChangeExtensions": false,
         "uploadPolicy": "DISALLOW_ALL",
         "uploadRestrictions": [
             "jpg",

diff --git a/scripts/filemanager.js b/scripts/filemanager.js
@@ -613,18 +613,22 @@ var selectItem = function(data) {
 // list views.
 var renameItem = function(data) {
 	var finalName = '';
-	var msg = lg.new_filename + ' : <input id="rname" name="rname" type="text" value="' + getFilename(data['Filename']) + '" />';
+	var fileName = config.security.allowChangeExtensions ? data['Filename'] : getFilename(data['Filename']);
+	var msg = lg.new_filename + ' : <input id="rname" name="rname" type="text" value="' + fileName + '" />';
 
 	var getNewName = function(v, m){
 		if(v != 1) return false;
 		rname = m.children('#rname').val();
 
 		if(rname != ''){
-			var givenName = nameFormat(rname);
-			var suffix = getExtension(data['Filename']);	
-			if(suffix.length > 0) {
-				givenName = givenName + '.' + suffix;
-			}
+			var givenName = rname;
+ 			if (! config.security.allowChangeExtensions) {
+				givenName = nameFormat(rname);
+				var suffix = getExtension(data['Filename']);	
+				if(suffix.length > 0) {
+					givenName = givenName + '.' + suffix;
+				}
+ 			}			
 			var oldPath = data['Path'];	
 			var connectString = fileConnector + '?mode=rename&old=' + data['Path'] + '&new=' + givenName;
 
@@ -1624,4 +1628,4 @@ $(function(){
 var doc = document.documentElement;
 doc.setAttribute('data-useragent', navigator.userAgent);
 
-})(jQuery);
+})(jQuery);