Remove InspIRCd* parameters and fields

[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 6b964a8b2a4b207162255a36a2df7b9ceff09d9e..411cd42c86cd23ceb9a65eb809f7f98e3bebaa7e 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,36 +1,28 @@
-// opermotd module by typobox43
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
 
 static FileReader* opermotd;
-static Server* Srv;
-
-void LoadOperMOTD()
-{
-       ConfigReader* conf = new ConfigReader;
-       std::string filename;
-
-       filename = conf->ReadValue("opermotd","file",0);
-
-       opermotd->LoadFile(filename);
-       DELETE(conf);
-}
 
-void ShowOperMOTD(userrec* user)
+CmdResult ShowOperMOTD(User* user)
 {
        if(!opermotd->FileSize())
        {
                user->WriteServ(std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
-               return;
+               return CMD_FAILURE;
        }
 
        user->WriteServ(std::string("375 ") + user->nick + std::string(" :- IRC Operators Message of the Day"));
@@ -42,82 +34,79 @@ void ShowOperMOTD(userrec* user)
 
        user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
 
+       /* don't route me */
+       return CMD_SUCCESS;
 }
 
-class cmd_opermotd : public command_t
+/** Handle /OPERMOTD
+ */
+class CommandOpermotd : public Command
 {
  public:
-       cmd_opermotd () : command_t("OPERMOTD", 'o', 0)
+       CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0)
        {
-               this->source = "m_opermotd.so";
-               syntax = "[<servername>]";
+               flags_needed = 'o'; syntax = "[<servername>]";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec* user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User* user)
        {
-               ShowOperMOTD(user);
+               return ShowOperMOTD(user);
        }
 };
 
+
 class ModuleOpermotd : public Module
 {
-               cmd_opermotd* mycommand;
-       public:
-               ModuleOpermotd(Server* Me)
-                       : Module::Module(Me)
-               {
-                       Srv = Me;
-                       mycommand = new cmd_opermotd();
-                       Srv->AddCommand(mycommand);
-                       opermotd = new FileReader();
-                       LoadOperMOTD();
-               }
-
-               virtual ~ModuleOpermotd()
-               {
-               }
-
-               virtual Version GetVersion()
-               {
-                       return Version(1,0,0,1,VF_VENDOR);
-               }
-
-               void Implements(char* List)
-               {
-                       List[I_OnRehash] = List[I_OnOper] = 1;
-               }
+       CommandOpermotd cmd;
+       bool onoper;
+ public:
 
-               virtual void OnOper(userrec* user, const std::string &opertype)
+       void LoadOperMOTD()
+       {
+               ConfigReader* conf = new ConfigReader;
+               std::string filename;
+               filename = conf->ReadValue("opermotd","file",0);
+               if (opermotd)
                {
-                       ShowOperMOTD(user);
+                       delete opermotd;
+                       opermotd = NULL;
                }
+               opermotd = new FileReader(filename);
+               onoper = conf->ReadFlag("opermotd","onoper","yes",0);
+               delete conf;
+       }
 
-               virtual void OnRehash(const std::string &parameter)
-               {
-                       LoadOperMOTD();
-               }
+       ModuleOpermotd()
+               : cmd(this)
+       {
+               opermotd = NULL;
+               ServerInstance->AddCommand(&cmd);
+               opermotd = new FileReader;
+               LoadOperMOTD();
+               Implementation eventlist[] = { I_OnRehash, I_OnOper };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
+       }
 
-};
+       virtual ~ModuleOpermotd()
+       {
+       }
 
-class ModuleOpermotdFactory : public ModuleFactory
-{
-       public:
-               ModuleOpermotdFactory()
-               {
-               }
+       virtual Version GetVersion()
+       {
+               return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR, API_VERSION);
+       }
 
-               ~ModuleOpermotdFactory()
-               {
-               }
 
-               virtual Module* CreateModule(Server* Me)
-               {
-                       return new ModuleOpermotd(Me);
-               }
+       virtual void OnOper(User* user, const std::string &opertype)
+       {
+               if (onoper)
+                       ShowOperMOTD(user);
+       }
 
+       virtual void OnRehash(User* user)
+       {
+               LoadOperMOTD();
+       }
 };
 
-extern "C" void* init_module(void)
-{
-       return new ModuleOpermotdFactory;
-}
+MODULE_INIT(ModuleOpermotd)