Change of configure message to plainer english as requested by voidzero

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index 734d5c2b251ab5766f539f53c4390d465158ce3c..ba98ad8651285d47421dd96df36563aaebe2ea0f 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -66,7 +66,7 @@ Module* Request::GetDest()
        return this->dest;
 }
 
-char* Request::Send()
+const char* Request::Send()
 {
        if (this->dest)
        {
@@ -123,7 +123,7 @@ void                Module::OnOper(User*, const std::string&) { }
 void           Module::OnPostOper(User*, const std::string&, const std::string &) { }
 void           Module::OnInfo(User*) { }
 void           Module::OnWhois(User*, User*) { }
-int            Module::OnUserPreInvite(User*, User*, Channel*) { return 0; }
+int            Module::OnUserPreInvite(User*, User*, Channel*, time_t) { return 0; }
 int            Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&) { return 0; }
 int            Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return 0; }
 int            Module::OnUserPreNick(User*, const std::string&) { return 0; }
@@ -134,13 +134,13 @@ int               Module::OnKill(User*, User*, const std::string&) { return 0; }
 void           Module::OnLoadModule(Module*, const std::string&) { }
 void           Module::OnUnloadModule(Module*, const std::string&) { }
 void           Module::OnBackgroundTimer(time_t) { }
-int            Module::OnPreCommand(const std::string&, const char**, int, User *, bool, const std::string&) { return 0; }
-void           Module::OnPostCommand(const std::string&, const char**, int, User *, CmdResult, const std::string&) { }
+int            Module::OnPreCommand(const std::string&, const char* const*, int, User *, bool, const std::string&) { return 0; }
+void           Module::OnPostCommand(const std::string&, const char* const*, int, User *, CmdResult, const std::string&) { }
 bool           Module::OnCheckReady(User*) { return true; }
 int            Module::OnUserRegister(User*) { return 0; }
 int            Module::OnUserPreKick(User*, User*, Channel*, const std::string&) { return 0; }
 void           Module::OnUserKick(User*, User*, Channel*, const std::string&, bool&) { }
-int            Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return 0; }
+int            Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int, bool) { return 0; }
 int            Module::OnCheckInvite(User*, Channel*) { return 0; }
 int            Module::OnCheckKey(User*, Channel*, const std::string&) { return 0; }
 int            Module::OnCheckLimit(User*, Channel*) { return 0; }
@@ -150,8 +150,8 @@ int         Module::OnChangeLocalUserHost(User*, const std::string&) { return 0; }
 int            Module::OnChangeLocalUserGECOS(User*, const std::string&) { return 0; }
 int            Module::OnLocalTopicChange(User*, Channel*, const std::string&) { return 0; }
 void           Module::OnEvent(Event*) { return; }
-char*          Module::OnRequest(Request*) { return NULL; }
-int            Module::OnOperCompare(const std::string&, const std::string&, int) { return 0; }
+const char*            Module::OnRequest(Request*) { return NULL; }
+int            Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return 0; }
 void           Module::OnGlobalOper(User*) { }
 void           Module::OnPostConnect(User*) { }
 int            Module::OnAddBan(User*, Channel*, const std::string &) { return 0; }
@@ -164,7 +164,7 @@ int         Module::OnRawSocketRead(int, char*, unsigned int, int&) { return 0; }
 void           Module::OnUserMessage(User*, void*, int, const std::string&, char, const CUList&) { }
 void           Module::OnUserNotice(User*, void*, int, const std::string&, char, const CUList&) { }
 void           Module::OnRemoteKill(User*, User*, const std::string&, const std::string&) { }
-void           Module::OnUserInvite(User*, User*, Channel*) { }
+void           Module::OnUserInvite(User*, User*, Channel*, time_t) { }
 void           Module::OnPostLocalTopicChange(User*, Channel*, const std::string&) { }
 void           Module::OnGetServerDescription(const std::string&, std::string&) { }
 void           Module::OnSyncUser(User*, Module*, void*) { }
@@ -192,6 +192,7 @@ void                Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, con
 void           Module::OnGarbageCollect() { }
 void           Module::OnBufferFlushed(User*) { }
 void           Module::OnText(User*, void*, int, const std::string&, char, CUList&) { }
+void           Module::OnRunTestSuite() { }
 
 
 ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
@@ -512,7 +513,7 @@ bool ModuleManager::Unload(const char* filename)
                {
                        modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second);
                }
-               for (user_hash::iterator u = Instance->clientlist->begin(); u != Instance->clientlist->end(); u++)
+               for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++)
                {
                        modfind->second.second->OnCleanup(TYPE_USER,u->second);
                }
@@ -641,6 +642,19 @@ modulelist* ModuleManager::FindInterface(const std::string &InterfaceName)
                return &(iter->second.second);
 }
 
+bool ModuleManager::ModuleHasInterface(Module* mod, const std::string& InterfaceName)
+{
+       interfacelist::iterator iter = Interfaces.find(InterfaceName);
+       if (iter == Interfaces.end())
+               return false;
+       else
+       {
+               modulelist& ml = iter->second.second;
+               modulelist::iterator mi = std::find(ml.begin(), ml.end(), mod);
+               return (mi != ml.end());
+       }
+}
+
 void ModuleManager::UseInterface(const std::string &InterfaceName)
 {
        interfacelist::iterator iter = Interfaces.find(InterfaceName);
@@ -707,7 +721,7 @@ bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spatter
        return match(sliteral.c_str(),spattern.c_str());
 }
 
-CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, User* user)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char* const* parameters, int pcnt, User* user)
 {
        return this->Parser->CallHandler(commandname,parameters,pcnt,user);
 }
@@ -726,12 +740,12 @@ void InspIRCd::AddCommand(Command *f)
        }
 }
 
-void InspIRCd::SendMode(const char** parameters, int pcnt, User *user)
+void InspIRCd::SendMode(const char* const* parameters, int pcnt, User *user)
 {
        this->Modes->Process(parameters,pcnt,user,true);
 }
 
-void InspIRCd::DumpText(User* User, const std::string &LinePrefix, stringstream &TextStream)
+void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream)
 {
        std::string CompleteLine = LinePrefix;
        std::string Word;
@@ -752,21 +766,6 @@ User* FindDescriptorHandler::Call(int socket)
        return reinterpret_cast<User*>(Server->SE->GetRef(socket));
 }
 
-bool InspIRCd::AddMode(ModeHandler* mh)
-{
-       return this->Modes->AddMode(mh);
-}
-
-bool InspIRCd::AddModeWatcher(ModeWatcher* mw)
-{
-       return this->Modes->AddModeWatcher(mw);
-}
-
-bool InspIRCd::DelModeWatcher(ModeWatcher* mw)
-{
-       return this->Modes->DelModeWatcher(mw);
-}
-
 bool InspIRCd::AddResolver(Resolver* r, bool cached)
 {
        if (!cached)
@@ -800,10 +799,6 @@ const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
 
 ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
 {
-       /* Is there any reason to load the entire config file again here?
-        * it's needed if they specify another config file, but using the
-        * default one we can just use the global config data - pre-parsed!
-        */
        this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
        this->error = CONF_NO_ERROR;
        this->data = &ServerInstance->Config->config_data;