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

Merge branch 'dev' of github.com:calzoneman/sync into dev 

What.  I don't even
This commit is contained in:
calzoneman 2013-06-04 18:49:40 -04:00
parent a02228afdd d5e03c10b6
commit c8dac585ed
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channel.js
View File

@ -537,12 +537,8 @@ Channel.prototype.userJoin = function(user) {
if(user.name != "") { if(user.name != "") {
for(var i = 0; i < this.users.length; i++) { for(var i = 0; i < this.users.length; i++) {
if(this.users[i].name.toLowerCase() == user.name.toLowerCase()) { if(this.users[i].name.toLowerCase() == user.name.toLowerCase()) {
user.name = ""; console.log("DBG");
user.loggedIn = false; this.kick(this.users[i], "Duplicate login");
user.socket.emit("login", {
success: false,
error: "The username " + user.name + " is already in use on this channel"
});
} }
} }
} }

2
package.json
View File

@ -2,7 +2,7 @@
"author": "Calvin Montgomery", "author": "Calvin Montgomery",
"name": "CyTube", "name": "CyTube",
"description": "Online media synchronizer and chat", "description": "Online media synchronizer and chat",
"version": "1.9.3", "version": "1.9.4",
"repository": { "repository": {
"url": "http://github.com/calzoneman/sync" "url": "http://github.com/calzoneman/sync"
}, },

2
server.js
View File

@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
const VERSION = "1.9.3"; const VERSION = "1.9.4";
var fs = require("fs"); var fs = require("fs");
var Logger = require("./logger.js"); var Logger = require("./logger.js");

6
user.js
View File

@ -521,11 +521,7 @@ User.prototype.login = function(name, pw, session) {
if(this.channel != null && name != "") { if(this.channel != null && name != "") {
for(var i = 0; i < this.channel.users.length; i++) { for(var i = 0; i < this.channel.users.length; i++) {
if(this.channel.users[i].name == name) { if(this.channel.users[i].name == name) {
this.socket.emit("login", { this.channel.kick(this.channel.users[i], "Duplicate login");
success: false,
error: "The username " + name + " is already in use on this channel"
});
return false;
} }
} }
} }