moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/calzoneman/sync

This commit is contained in:
calzoneman 2013-03-20 22:29:42 -05:00
parent d68d0277bb b565324ec3
commit 84917ecc4f
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
user.js
View File

@ -28,6 +28,7 @@ var User = function(socket, ip) {
} }
}; };
// Set up socket callbacks // Set up socket callbacks
User.prototype.initCallbacks = function() { User.prototype.initCallbacks = function() {
// What a shame // What a shame
@ -37,6 +38,8 @@ User.prototype.initCallbacks = function() {
}.bind(this)); }.bind(this));
this.socket.on('joinChannel', function(data) { this.socket.on('joinChannel', function(data) {
if(!data.name.match(/^[a-zA-Z0-9]+$/))
return;
// Channel already loaded // Channel already loaded
if(data.name in Server.channels) { if(data.name in Server.channels) {
this.channel = Server.channels[data.name]; this.channel = Server.channels[data.name];

6
www/assets/js/client.js
View File

@ -61,6 +61,12 @@ if(params['channel'] == undefined) {
} }
}); });
} }
else if(!params['channel'].match(/^[a-zA-Z0-9]+$/)) {
$('<div/>').addClass('alert alert-error')
.insertAfter($('.row')[0])[0]
.innerHTML = "<h3>Invalid Channel Name</h3><p>Channel names must conain only numbers and letters</p>";
}
else { else {
socket.emit('joinChannel', { socket.emit('joinChannel', {
name: params['channel'] name: params['channel']