From 085cd4278f0f495c6d008a3d157026b33a23b787 Mon Sep 17 00:00:00 2001 From: brain Date: Sun, 16 Jul 2006 15:08:59 +0000 Subject: Created new class irc::commasepstream. Will read comma seperated lists and works identically to irc::tokenstream It's re-entrant so we can run two of them together for JOIN git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4412 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/cmd_join.cpp | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'src/cmd_join.cpp') diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp index fc63283e5..728038c2e 100644 --- a/src/cmd_join.cpp +++ b/src/cmd_join.cpp @@ -24,15 +24,28 @@ extern InspIRCd* ServerInstance; void cmd_join::Handle (const char** parameters, int pcnt, userrec *user) { - if (ServerInstance->Parser->LoopCall(this, parameters, pcnt, user, 0, 0, 1)) - return; - - if (IsValidChannelName(parameters[0])) + if (pcnt > 1) { - add_channel(user, parameters[0], parameters[1], false); + if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0, 1)) + return; + + if (IsValidChannelName(parameters[0])) + { + add_channel(user, parameters[0], parameters[1], false); + return; + } } else { - WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]); + if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0)) + return; + + if (IsValidChannelName(parameters[0])) + { + add_channel(user, parameters[0], "", false); + return; + } } + + WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]); } -- cgit v1.2.3