Skip to content
Snippets Groups Projects
Commit c83f68a7 authored by Diego Sampaio's avatar Diego Sampaio
Browse files

uses the setting for validating rooms renaming - closes #2297

parent f87d44fc
No related branches found
No related tags found
No related merge requests found
......@@ -65,7 +65,13 @@ Template.channelSettings.onCreated ->
return false
name = $('input[name=roomName]').val()
if not /^[0-9a-z-_]+$/.test name
try
nameValidation = new RegExp '^' + RocketChat.settings.get('UTF8_Names_Validation') + '$'
catch
nameValidation = new RegExp '^[0-9a-zA-Z-_.]+$'
if not nameValidation.test name
toastr.error t('Invalid_room_name', name)
return false
......
......@@ -11,7 +11,12 @@ RocketChat.saveRoomName = (rid, name) ->
#if room.u._id isnt Meteor.userId() and not hasPermission
throw new Meteor.Error 403, 'Not allowed'
if not /^[0-9a-z-_]+$/.test name
try
nameValidation = new RegExp '^' + RocketChat.settings.get('UTF8_Names_Validation') + '$'
catch
nameValidation = new RegExp '^[0-9a-zA-Z-_.]+$'
if not nameValidation.test name
throw new Meteor.Error 'name-invalid', 'Invalid_room_name', { channelName: name }
name = _.slugify name
......
......@@ -95,7 +95,13 @@ Template.adminRoomInfo.onCreated ->
return false
name = $('input[name=roomName]').val()
if not /^[0-9a-z-_]+$/.test name
try
nameValidation = new RegExp '^' + RocketChat.settings.get('UTF8_Names_Validation') + '$'
catch
nameValidation = new RegExp '^[0-9a-zA-Z-_.]+$'
if not nameValidation.test name
toastr.error t('Invalid_room_name', name)
return false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment