Improved strhashcomp with no allocations

[user/henk/code/inspircd.git] / src / modules / m_sajoin.cpp

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 553211c60428cb5d7ab0906ddbec6f0459cc6f0a..2471efe91fae41e54c8c34d24b138217a87c5d7f 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -21,47 +21,48 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
 
-Server *Srv;
-        
-void handle_sajoin(char **parameters, int pcnt, userrec *user)
+static Server *Srv;
+
+class cmd_sajoin : public command_t
 {
-       userrec* dest = Srv->FindNick(std::string(parameters[0]));
-       if (dest)
+ public:
+       cmd_sajoin() : command_t("SAJOIN", 'o', 2)
        {
-               /* might be nicer to make checking valid channel names an api function sometime --w00t */
-               if (parameters[1][0] != '#')
-               {
-                       /* we didn't need to check this for each character ;) */
-                       Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-                       return;
-               }
+               this->source = "m_sajoin.so";
+       }
 
-               for (unsigned int x = 0; x < strlen(parameters[1]); x++)
+       void Handle (char **parameters, int pcnt, userrec *user)
+       {
+               userrec* dest = Srv->FindNick(std::string(parameters[0]));
+               if (dest)
                {
-                               if ((parameters[1][x] == ' ') || (parameters[1][x] == ','))
-                               {
-                                       Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-                                       return;
-                               }
-               }
+                       if (!IsValidChannelName(parameters[1]))
+                       {
+                               /* we didn't need to check this for each character ;) */
+                               Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
+                               return;
+                       }
 
-               Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
-               Srv->JoinUserToChannel(dest,std::string(parameters[1]),std::string(dest->nick));
+                       Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+                       Srv->JoinUserToChannel(dest,std::string(parameters[1]),std::string(dest->nick));
+               }
        }
-}
-
+};
 
 class ModuleSajoin : public Module
 {
+       cmd_sajoin*     mycommand;
  public:
        ModuleSajoin(Server* Me)
                : Module::Module(Me)
        {
                Srv = Me;
-               Srv->AddCommand("SAJOIN",handle_sajoin,'o',2,"m_sajoin.so");
+               mycommand = new cmd_sajoin();
+               Srv->AddCommand(mycommand);
        }
        
        virtual ~ModuleSajoin()