Prevent setting mode -H if already unset, bug #74

[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 a80aa513c0822ac3609f532b0b303ba0245ba7f7..7b4584db9c52fdd0a0c05553f49a875809f94017 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,46 +11,44 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.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;
 
-CmdResult ShowOperMOTD(userrec* user)
+CmdResult ShowOperMOTD(User* user)
 {
        if(!opermotd->FileSize())
        {
                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"));
 
+       /* don't route me */
        return CMD_SUCCESS;
 }
 
 /** Handle /OPERMOTD
  */
-class cmd_opermotd : public command_t
+class CommandOpermotd : public Command
 {
  public:
-       cmd_opermotd (InspIRCd* Instance) : command_t(Instance,"OPERMOTD", 'o', 0)
+       CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0)
        {
-               this->source = "m_opermotd.so";
-               syntax = "[<servername>]";
+               flags_needed = 'o'; syntax = "[<servername>]";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec* user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User* user)
        {
                return ShowOperMOTD(user);
        }
@@ -59,76 +57,49 @@ class cmd_opermotd : public command_t
 
 class ModuleOpermotd : public Module
 {
-       cmd_opermotd* mycommand;
+       CommandOpermotd cmd;
+       bool onoper;
  public:
 
        void LoadOperMOTD()
        {
-               ConfigReader* conf = new ConfigReader(ServerInstance);
-               std::string filename;
-               filename = conf->ReadValue("opermotd","file",0);
-               if (opermotd)
-               {
-                       delete opermotd;
-                       opermotd = NULL;
-               }
-               opermotd = new FileReader(ServerInstance, filename);
-               DELETE(conf);
+               ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
+               opermotd->LoadFile(conf->getString("file","opermotd"));
+               onoper = conf->getBool("onoper", true);
        }
-       
-       ModuleOpermotd(InspIRCd* Me)
-               : Module::Module(Me)
+
+       ModuleOpermotd()
+               : cmd(this)
        {
                opermotd = NULL;
-               mycommand = new cmd_opermotd(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-               opermotd = new FileReader(ServerInstance);
+               ServerInstance->AddCommand(&cmd);
+               opermotd = new FileReader;
                LoadOperMOTD();
+               Implementation eventlist[] = { I_OnRehash, I_OnOper };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleOpermotd()
        {
+               delete opermotd;
+               opermotd = NULL;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR);
        }
 
-       void Implements(char* List)
+       virtual void OnOper(User* user, const std::string &opertype)
        {
-               List[I_OnRehash] = List[I_OnOper] = 1;
+               if (onoper)
+                       ShowOperMOTD(user);
        }
 
-       virtual void OnOper(userrec* user, const std::string &opertype)
-       {
-               ShowOperMOTD(user);
-       }
-
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                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)