Server* Srv marked static or moved to private member of module class in all modules...

[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 06b994c915927a8d97b86d975460a6d01b0dcd6f..0cf4efdc04ce57c5c50b3e4265a9546a28cf6881 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,118 +1,121 @@
 // opermotd module by typobox43
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.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() {
+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) {
-
-       if(!opermotd->FileSize()) {
-
+void ShowOperMOTD(userrec* user)
+{
+       if(!opermotd->FileSize())
+       {
                Srv->SendServ(user->fd,std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
                return;
-
        }
 
        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++) {
-
+       for(int i=0; i != opermotd->FileSize(); i++)
+       {
                Srv->SendServ(user->fd,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);
-
-}
+class cmd_opermotd : public command_t
+{
+ public:
+       cmd_opermotd () : command_t("OPERMOTD", 'o', 0)
+       {
+               this->source = "m_opermotd.so";
+       }
 
-class ModuleOpermotd : public Module {
+       void Handle (char** parameters, int pcnt, userrec* user)
+       {
+               ShowOperMOTD(user);
+       }
+};
 
+class ModuleOpermotd : public Module
+{
+               cmd_opermotd* mycommand;
        public:
-
-               ModuleOpermotd() {
-
-                       Srv = new Server;
-                       
-                       Srv->AddCommand("OPERMOTD",do_opermotd,'o',0,"m_opermotd.so");
-
+               ModuleOpermotd(Server* Me)
+                       : Module::Module(Me)
+               {
+                       Srv = Me;
+                       mycommand = new cmd_opermotd();
+                       Srv->AddCommand(mycommand);
                        opermotd = new FileReader();
                        LoadOperMOTD();
-
                }
 
-               virtual ~ModuleOpermotd() {
-
-                       delete Srv;
-
+               virtual ~ModuleOpermotd()
+               {
                }
 
-               virtual Version GetVersion() {
-
-                       return Version(1,0,0,1);
-
+               virtual Version GetVersion()
+               {
+                       return Version(1,0,0,1,VF_VENDOR);
                }
 
-               virtual void OnOper(userrec* user) {
+               void Implements(char* List)
+               {
+                       List[I_OnRehash] = List[I_OnOper] = 1;
+               }
 
+               virtual void OnOper(userrec* user, std::string opertype)
+               {
                        ShowOperMOTD(user);
-
                }
 
-               virtual void OnRehash() {
-
+               virtual void OnRehash(std::string parameter)
+               {
                        LoadOperMOTD();
-
                }
 
 };
 
-class ModuleOpermotdFactory : public ModuleFactory {
-
+class ModuleOpermotdFactory : public ModuleFactory
+{
        public:
-
-               ModuleOpermotdFactory() {
-
+               ModuleOpermotdFactory()
+               {
                }
 
-               ~ModuleOpermotdFactory() {
-
+               ~ModuleOpermotdFactory()
+               {
                }
 
-               virtual Module* CreateModule() {
-
-                       return new ModuleOpermotd;
-
+               virtual Module* CreateModule(Server* Me)
+               {
+                       return new ModuleOpermotd(Me);
                }
 
 };
 
-extern "C" void* init_module(void) {
-
+extern "C" void* init_module(void)
+{
        return new ModuleOpermotdFactory;
-
 }