Use Utils->ServerUser instead of ServerInstance->FakeClient in m_spanningtree

[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..fc6e7b91f2ce5afa85b70526c92dcd7535c31045 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-2009 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,45 @@
  * ---------------------------------------------------
  */
 
-#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"));
 
-       return CMD_SUCCESS;
+       /* don't route me */
+       return CMD_LOCALONLY;
 }
 
 /** Handle /OPERMOTD
  */
-class cmd_opermotd : public command_t
+class CommandOpermotd : public Command
 {
  public:
-       cmd_opermotd (InspIRCd* Instance) : command_t(Instance,"OPERMOTD", 'o', 0)
+       CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", "o", 0)
        {
                this->source = "m_opermotd.so";
                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,7 +58,8 @@ class cmd_opermotd : public command_t
 
 class ModuleOpermotd : public Module
 {
-       cmd_opermotd* mycommand;
+       CommandOpermotd* mycommand;
+       bool onoper;
  public:
 
        void LoadOperMOTD()
@@ -73,17 +73,20 @@ class ModuleOpermotd : public Module
                        opermotd = NULL;
                }
                opermotd = new FileReader(ServerInstance, filename);
-               DELETE(conf);
+               onoper = conf->ReadFlag("opermotd","onoper","yes",0);
+               delete conf;
        }
-       
+
        ModuleOpermotd(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                opermotd = NULL;
-               mycommand = new cmd_opermotd(ServerInstance);
+               mycommand = new CommandOpermotd(ServerInstance);
                ServerInstance->AddCommand(mycommand);
                opermotd = new FileReader(ServerInstance);
                LoadOperMOTD();
+               Implementation eventlist[] = { I_OnRehash, I_OnOper };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleOpermotd()
@@ -92,43 +95,20 @@ class ModuleOpermotd : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnOper] = 1;
-       }
 
-       virtual void OnOper(userrec* user, const std::string &opertype)
+       virtual void OnOper(User* user, const std::string &opertype)
        {
-               ShowOperMOTD(user);
+               if (onoper)
+                       ShowOperMOTD(user);
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* 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)