Proper fix for the prefix corruption (for user names with non-alphanumeric characters)

Vlad Ya · Vlad Ya · commit cc456f20b5f5 · 2015-11-04T13:09:29.000-05:00
and keep the prevention of addition of ftp user names with non-alphanumeric characters as it was intended initially
diff --git a/web/js/pages/add.web.js b/web/js/pages/add.web.js
@@ -3,11 +3,11 @@ App.Actions.WEB.update_ftp_username_hint = function(elm, hint) {
         $(elm).parent().find('.hint').html('');
     }
 
-    //hint = hint.replace(/[^\w\d]/gi, '');
-
     if (hint.indexOf(GLOBAL.FTP_USER_PREFIX) == 0) {
         hint = hint.slice(GLOBAL.FTP_USER_PREFIX.length, hint.length);
     }
+    hint = hint.replace(/[^\w\d]/gi, '');
+
     $(elm).parent().find('.v-ftp-user').val(hint);
     $(elm).parent().find('.hint').text(GLOBAL.FTP_USER_PREFIX + hint);
 }
diff --git a/web/js/pages/edit.web.js b/web/js/pages/edit.web.js
@@ -3,11 +3,11 @@ App.Actions.WEB.update_ftp_username_hint = function(elm, hint) {
         $(elm).parent().find('.hint').html('');
     }
 
-    //hint = hint.replace(/[^\w\d]/gi, '');
-
     if (hint.indexOf(GLOBAL.FTP_USER_PREFIX) == 0) {
         hint = hint.slice(GLOBAL.FTP_USER_PREFIX.length, hint.length);
     }
+    hint = hint.replace(/[^\w\d]/gi, '');
+
     $(elm).parent().find('.v-ftp-user').val(hint);
     $(elm).parent().find('.hint').text(GLOBAL.FTP_USER_PREFIX + hint);
 }

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@ App.Actions.WEB.update_ftp_username_hint = function(elm, hint) {`
`3`	`3`	`$(elm).parent().find('.hint').html('');`
`4`	`4`	`}`
`5`	`5`
`6`		`- //hint = hint.replace(/[^\w\d]/gi, '');`
`7`		`-`
`8`	`6`	`if (hint.indexOf(GLOBAL.FTP_USER_PREFIX) == 0) {`
`9`	`7`	`hint = hint.slice(GLOBAL.FTP_USER_PREFIX.length, hint.length);`
`10`	`8`	`}`
	`9`	`+ hint = hint.replace(/[^\w\d]/gi, '');`
	`10`	`+`
`11`	`11`	`$(elm).parent().find('.v-ftp-user').val(hint);`
`12`	`12`	`$(elm).parent().find('.hint').text(GLOBAL.FTP_USER_PREFIX + hint);`
`13`	`13`	`}`