Fixed compile problems... Move along please, nothing to see here..

[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 76c568ea71964083032644ef36266d974688cb9c..bbf6832260ada47cc974a770f4ab388c125ac5c7 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -25,39 +25,57 @@ using namespace std;
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
 
 Server *Srv;
-        
-void handle_sajoin(char **parameters, int pcnt, userrec *user)
+
+class cmd_sajoin : public command_t
 {
-       userrec* dest = Srv->FindNick(std::string(parameters[0]));
-       if (dest)
+ public:
+       cmd_sajoin() : command_t("SAJOIN", 'o', 2)
+       {
+               this->source = "m_sajoin.cpp";
+       }
+
+       void Handle (char **parameters, int pcnt, userrec *user)
        {
-               for (unsigned int x = 0; x < strlen(parameters[1]); x++)
+               userrec* dest = Srv->FindNick(std::string(parameters[0]));
+               if (dest)
                {
-                               if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ','))
-                               {
-                                       Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-                                       return;
-                               }
-               }
+                       /* 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;
+                       }
 
-               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));
-       }
-}
+                       for (unsigned int x = 0; x < strlen(parameters[1]); x++)
+                       {
+                                       if ((parameters[1][x] == ' ') || (parameters[1][x] == ','))
+                                       {
+                                               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));
+               }
+       }
+};
 
 class ModuleSajoin : public Module
 {
+       cmd_sajoin*     mycommand;
  public:
-       ModuleSajoin()
+       ModuleSajoin(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
-               Srv->AddCommand("SAJOIN",handle_sajoin,'o',2,"m_sajoin.so");
+               Srv = Me;
+               mycommand = new cmd_sajoin();
+               Srv->AddCommand(mycommand);
        }
        
        virtual ~ModuleSajoin()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
@@ -80,9 +98,9 @@ class ModuleSajoinFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleSajoin;
+               return new ModuleSajoin(Me);
        }
        
 };