Remove dummy API_VERSION from Version constructor

[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 d52bb01621976a306cb238d0458a9b467226eae3..a9f7b3b0742aa5e61bd996b3a8cd0da3936e9aa6 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,119 +1,112 @@
-// opermotd module by typobox43
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | 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.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 
 /* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
 
-FileReader* opermotd;
-Server* Srv;
-
-void do_opermotd(char** parameters, int pcnt, userrec* user);
-
-void LoadOperMOTD() {
-
-       ConfigReader* conf = new ConfigReader;
-       std::string filename;
-
-       filename = conf->ReadValue("opermotd","file",0);
-
-       opermotd->LoadFile(filename);
-       
-}
-
-void ShowOperMOTD(userrec* user) {
-
-       if(!opermotd->FileSize()) {
-
-               Srv->SendServ(user->fd,std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
-               return;
+static FileReader* opermotd;
 
+CmdResult ShowOperMOTD(User* user)
+{
+       if(!opermotd->FileSize())
+       {
+               user->WriteServ(std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
+               return CMD_FAILURE;
        }
 
-       Srv->SendServ(user->fd,std::string("375 ") + user->nick + std::string(" :- IRC Operators Message of the Day"));
-
-       for(int i=0; i != opermotd->FileSize(); i++) {
-
-               Srv->SendServ(user->fd,std::string("372 ") + user->nick + std::string(" :- ") + opermotd->GetLine(i));
+       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));
        }
 
-       Srv->SendServ(user->fd,std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
-
-}
-
-void do_opermotd(char** parameters, int pcnt, userrec* user) {
-
-       ShowOperMOTD(user);
+       user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
 
+       /* don't route me */
+       return CMD_SUCCESS;
 }
 
-class ModuleOpermotd : public Module {
-
-       public:
-
-               ModuleOpermotd() {
-
-                       Srv = new Server;
-                       
-                       Srv->AddCommand("OPERMOTD",do_opermotd,'o',0,"m_opermotd.so");
-
-                       opermotd = new FileReader();
-                       LoadOperMOTD();
-
-               }
-
-               virtual ~ModuleOpermotd() {
-
-                       delete Srv;
-
-               }
-
-               virtual Version GetVersion() {
-
-                       return Version(1,0,0,1,VF_VENDOR);
-
-               }
-
-               virtual void OnOper(userrec* user) {
-
-                       ShowOperMOTD(user);
-
-               }
-
-               virtual void OnRehash() {
-
-                       LoadOperMOTD();
-
-               }
+/** Handle /OPERMOTD
+ */
+class CommandOpermotd : public Command
+{
+ public:
+       CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0)
+       {
+               flags_needed = 'o'; syntax = "[<servername>]";
+       }
 
+       CmdResult Handle (const std::vector<std::string>& parameters, User* user)
+       {
+               return ShowOperMOTD(user);
+       }
 };
 
-class ModuleOpermotdFactory : public ModuleFactory {
-
-       public:
-
-               ModuleOpermotdFactory() {
 
+class ModuleOpermotd : public Module
+{
+       CommandOpermotd cmd;
+       bool onoper;
+ public:
+
+       void LoadOperMOTD()
+       {
+               ConfigReader* conf = new ConfigReader;
+               std::string filename;
+               filename = conf->ReadValue("opermotd","file",0);
+               if (opermotd)
+               {
+                       delete opermotd;
+                       opermotd = NULL;
                }
+               opermotd = new FileReader(filename);
+               onoper = conf->ReadFlag("opermotd","onoper","yes",0);
+               delete conf;
+       }
 
-               ~ModuleOpermotdFactory() {
+       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()
+       {
+       }
 
-               virtual Module* CreateModule() {
+       virtual Version GetVersion()
+       {
+               return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR);
+       }
 
-                       return new ModuleOpermotd;
 
-               }
+       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)