Merge pull request #31 from Madriix/master

Fixed undefined in userhosts

Author: realrasengan

bouncer.js

@@ -805,7 +805,7 @@ function clientConnect(socket) {
       }
 
       if (true) {
-        for(let n=0;n<lines.length;n++) {
+        for(n=0;n<lines.length;n++) {
           if(DEBUG)
             console.log("> "+lines[n]);
           data = lines[n].trim().split(" ");
@@ -862,9 +862,18 @@ function clientConnect(socket) {
             continue;
           }
 
-          if(SASL && data[1]=="903") {
-            this.write("CAP END\n");
-            continue;
+          // :irc.server 904 <nick> :SASL authentication failed
+          if(data[1]=="904") {
+            if(!this.authenticated) {
+              this.end();
+            }
+          }
+
+          // :x 903 y :SASL authentication successful
+          if(data[1]=="903") {
+            if(!this.authenticated) {
+              this.write("CAP END\n");
+            }
           }
 
           let s = (data[2]=="JOIN" || data[2]=="PART" || data[2]=="QUIT" || data[2]=="MODE" || data[2]=="PING" || data[2]=="NICK" || data[2]=="KICK" ? data[2] : data[1]);
@@ -1207,10 +1216,14 @@ function clientConnect(socket) {
               }
               for(x=0;x<_names.length;x++) {
                 this.channels[_channel].names.push(_names[x].trim().split("!")[0]);
-                if(typeof this.channels[_channel].userhosts !== 'undefined' && _names[x].trim().indexOf("!")>=0)
+
+                if (typeof this.channels[_channel].userhosts === 'undefined')
+                  this.channels[_channel].userhosts=[];
+
+                if(_names[x].trim().indexOf("!")>=0)
                   this.channels[_channel].userhosts.push(_names[x].trim().split("!")[1]);
-                  /*else
-					  this.channels[_channel].userhosts.push("*@*");	*/						
+                /*else
+                  this.channels[_channel].userhosts.push("*@*");	*/						
               }
               break;
             case '366':
@@ -1247,7 +1260,7 @@ function clientConnect(socket) {
               }
               break;
           }
-		  if(data[1] == "PING") {
+          if(data[1] == "PING") {
             this.write("PONG "+data[2].substr(1).trim()+"\n");
             continue;
           }
@@ -1291,7 +1304,7 @@ function clientConnect(socket) {
         this.parents[x].end();
       }
       this.buffers=false;
-	  delete connections[hash(this.nick+this.password+this.server+this.port.toString())];
+      delete connections[hash(this.nick+this.password+this.server+this.port.toString())];
       this.destroy();
     });
     connection.on('error', function(err) {