Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 5d50d41924214a437a91696b07ce53952be70fb4..491792996347f274396b7d9bfa3ce44bf7747adf 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -13,12 +13,12 @@ using namespace std;
 
 static FileReader* opermotd;
 
-void ShowOperMOTD(userrec* user)
+CmdResult ShowOperMOTD(userrec* 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"));
        for(int i=0; i != opermotd->FileSize(); i++)
@@ -26,8 +26,12 @@ void ShowOperMOTD(userrec* user)
                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;
 }
 
+/** Handle /OPERMOTD
+ */
 class cmd_opermotd : public command_t
 {
  public:
@@ -37,9 +41,9 @@ class cmd_opermotd : public command_t
                syntax = "[<servername>]";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec* user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec* user)
        {
-               ShowOperMOTD(user);
+               return ShowOperMOTD(user);
        }
 };
 
@@ -79,7 +83,7 @@ class ModuleOpermotd : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 
        void Implements(char* List)