fix some unitialised vectors and tidy up a bit.

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

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index d021f6d9f5ecc4b766dd5b7d6719e521dc6d7891..75f953f437f19dd5553701e88c00524320dba740 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -26,7 +26,7 @@ class AuditoriumMode : public ModeHandler
                {
                        if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP))
                        {
-                               source->WriteServ("482 %s %s :Only channel operators may %sset channel mode +u", source->nick, channel->name, adding ? "" : "un");
+                               source->WriteNumeric(482, "%s %s :Only channel operators may %sset channel mode +u", source->nick, channel->name, adding ? "" : "un");
                                return MODEACTION_DENY;
                        }
                        else
@@ -74,12 +74,6 @@ class ModuleAuditorium : public Module
                delete aum;
        }
 
-       void Prioritize()
-       {
-               Module* namesx = ServerInstance->Modules->Find("m_namesx.so");
-               ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIO_BEFORE, &namesx);
-       }
-
        virtual void OnRehash(User* user, const std::string &parameter)
        {
                ConfigReader conf(ServerInstance);
@@ -89,7 +83,7 @@ class ModuleAuditorium : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
         virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
@@ -167,7 +161,6 @@ class ModuleAuditorium : public Module
        {
                Command* parthandler = ServerInstance->Parser->GetHandler("PART");
                std::vector<std::string> to_leave;
-               const char* parameters[2];
                if (parthandler)
                {
                        for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
@@ -178,9 +171,10 @@ class ModuleAuditorium : public Module
                        /* We cant do this neatly in one loop, as we are modifying the map we are iterating */
                        for (std::vector<std::string>::iterator n = to_leave.begin(); n != to_leave.end(); n++)
                        {
-                               parameters[0] = n->c_str();
+                               std::vector<std::string> parameters;
+                               parameters.push_back(*n);
                                /* This triggers our OnUserPart, above, making the PART silent */
-                               parthandler->Handle(parameters, 1, user);
+                               parthandler->Handle(parameters, user);
                        }
                }
        }