Added some missing parameter checking in m_swhois

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

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 55bc49a3b17b41ca82a05eba0a9bda96f03ce936..55608dcb8ccddfa9891e131350443cca52c4fae3 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -11,13 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include "inspircd.h"
-
 /* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
 
 static FileReader* opermotd;
@@ -29,14 +27,18 @@ CmdResult ShowOperMOTD(userrec* user)
                user->WriteServ(std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
                return CMD_FAILURE;
        }
+
        user->WriteServ(std::string("375 ") + user->nick + std::string(" :- IRC Operators Message of the Day"));
+
        for(int i=0; i != opermotd->FileSize(); i++)
        {
                user->WriteServ(std::string("372 ") + user->nick + std::string(" :- ") + opermotd->GetLine(i));
        }
+
        user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
 
-       return CMD_SUCCESS;
+       /* don't route me */
+       return CMD_LOCALONLY;
 }
 
 /** Handle /OPERMOTD
@@ -77,7 +79,7 @@ class ModuleOpermotd : public Module
        }
        
        ModuleOpermotd(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                opermotd = NULL;
                mycommand = new cmd_opermotd(ServerInstance);
@@ -105,30 +107,10 @@ class ModuleOpermotd : public Module
                ShowOperMOTD(user);
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                LoadOperMOTD();
        }
 };
 
-class ModuleOpermotdFactory : public ModuleFactory
-{
- public:
-       ModuleOpermotdFactory()
-       {
-       }
-
-       ~ModuleOpermotdFactory()
-       {
-       }
-
-       virtual Module* CreateModule(InspIRCd* Me)
-       {
-               return new ModuleOpermotd(Me);
-       }
-};
-
-extern "C" void* init_module(void)
-{
-       return new ModuleOpermotdFactory;
-}
+MODULE_INIT(ModuleOpermotd)