Gah, im forgetting to SetMode!

[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 5e7ae97868eb9a7f950cf175859fb1cea6319fca..2471efe91fae41e54c8c34d24b138217a87c5d7f 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -1,43 +1,77 @@
-// Sajoin and +g support module by C.J.Edwards
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *               <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
 
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
+
+/* $ModDesc: Provides support for unreal-style SAJOIN command */
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+static Server *Srv;
 
-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)
        {
-               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));
+               this->source = "m_sajoin.so";
        }
-}
 
+       void Handle (char **parameters, int pcnt, userrec *user)
+       {
+               userrec* dest = Srv->FindNick(std::string(parameters[0]));
+               if (dest)
+               {
+                       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));
+               }
+       }
+};
 
 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);
+               Srv = Me;
+               mycommand = new cmd_sajoin();
+               Srv->AddCommand(mycommand);
        }
        
        virtual ~ModuleSajoin()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1);
+               return Version(1,0,0,1,VF_VENDOR);
        }
        
 };
@@ -55,9 +89,9 @@ class ModuleSajoinFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleSajoin;
+               return new ModuleSajoin(Me);
        }
        
 };