Decide that it wasn't quite appropriate :(

[user/henk/code/inspircd.git] / src / cmd_join.cpp

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 621a187ef2f915066b54b84a81c32186e1afa223..883f352135da47c3fcce7eff20df0742257e55ef 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -50,10 +50,15 @@ void cmd_join::Handle (char **parameters, int pcnt, userrec *user)
        
        if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,0,1))
                return;
-       if (parameters[0][0] == '#')
+
+       if (IsValidChannelName(parameters[0]))
        {
                Ptr = add_channel(user,parameters[0],parameters[1],false);
        }
+       else
+       {
+               WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]);
+       }
 }