Fix for bug #569, thanks dz.

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 28eeec7c27530eda8cf5cc7212476cd0f86e0de2..d3de60f6a850d6399b1b0859c1f40df76cb673c4 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -111,10 +111,10 @@ void              Module::OnUserQuit(User*, const std::string&, const std::string&) { }
 void           Module::OnUserDisconnect(User*) { }
 void           Module::OnUserJoin(User*, Channel*, bool, bool&) { }
 void           Module::OnPostJoin(User*, Channel*) { }
-void           Module::OnUserPart(User*, Channel*, const std::string&, bool&) { }
+void           Module::OnUserPart(User*, Channel*, std::string&, bool&) { }
 void           Module::OnRehash(User*, const std::string&) { }
 void           Module::OnServerRaw(std::string&, bool, User*) { }
-int            Module::OnUserPreJoin(User*, Channel*, const char*, std::string&) { return 0; }
+int            Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; }
 void           Module::OnMode(User*, void*, int, const std::string&) { }
 Version                Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); }
 void           Module::OnOper(User*, const std::string&) { }
@@ -132,8 +132,8 @@ 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* const*, int, User *, bool, const std::string&) { return 0; }
-void           Module::OnPostCommand(const std::string&, const char* const*, int, User *, CmdResult, const std::string&) { }
+int            Module::OnPreCommand(std::string&, std::vector<std::string>&, User *, bool, const std::string&) { return 0; }
+void           Module::OnPostCommand(const std::string&, const std::vector<std::string>&, 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; }
@@ -143,6 +143,7 @@ int         Module::OnCheckInvite(User*, Channel*) { return 0; }
 int            Module::OnCheckKey(User*, Channel*, const std::string&) { return 0; }
 int            Module::OnCheckLimit(User*, Channel*) { return 0; }
 int            Module::OnCheckBan(User*, Channel*) { return 0; }
+int            Module::OnCheckExtBan(User *, Channel *, char) { return 0; }
 int            Module::OnStats(char, User*, string_list&) { return 0; }
 int            Module::OnChangeLocalUserHost(User*, const std::string&) { return 0; }
 int            Module::OnChangeLocalUserGECOS(User*, const std::string&) { return 0; }
@@ -332,7 +333,21 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
 
        /* Do we need to swap? */
        if (swap && (swap_pos != source))
-               std::swap(EventHandlers[i][swap_pos], EventHandlers[i][source]);
+       {
+               /* Suggestion from Phoenix, "shuffle" the modules to better retain call order */
+               int incrmnt = 1;
+
+               if (source > swap_pos)
+                       incrmnt = -1;
+
+               for (unsigned int j = source; j != swap_pos; j += incrmnt)
+               {
+                       if (( j + incrmnt > EventHandlers[i].size() - 1) || (j + incrmnt < 0))
+                               continue;
+
+                       std::swap(EventHandlers[i][j], EventHandlers[i][j+incrmnt]);
+               }
+       }
 
        return true;
 }
@@ -356,7 +371,7 @@ bool ModuleManager::Load(const char* filename)
                {
                        /* Try and locate and load all modules matching the pattern */
                        dirent* entry = NULL;
-                       while ((entry = readdir(library)))
+                       while (0 != (entry = readdir(library)))
                        {
                                if (Instance->MatchText(entry->d_name, filename))
                                {
@@ -602,14 +617,12 @@ bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* M
                modulelist ml;
                ml.push_back(Mod);
                Interfaces[InterfaceName] = std::make_pair(0, ml);
-               return true;
        }
        else
        {
                iter->second.second.push_back(Mod);
-               return true;
        }
-       return false;
+       return true;
 }
 
 bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
@@ -717,12 +730,12 @@ Channel* InspIRCd::GetChannelIndex(long index)
 
 bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern)
 {
-       return match(sliteral.c_str(),spattern.c_str());
+       return match(sliteral, spattern);
 }
 
-CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char* const* parameters, int pcnt, User* user)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
 {
-       return this->Parser->CallHandler(commandname,parameters,pcnt,user);
+       return this->Parser->CallHandler(commandname, parameters, user);
 }
 
 bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user)
@@ -739,9 +752,9 @@ void InspIRCd::AddCommand(Command *f)
        }
 }
 
-void InspIRCd::SendMode(const char* const* parameters, int pcnt, User *user)
+void InspIRCd::SendMode(const std::vector<std::string>& parameters, User *user)
 {
-       this->Modes->Process(parameters,pcnt,user,true);
+       this->Modes->Process(parameters, user, true);
 }
 
 void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream)