Fix a number of commands to have max_params field. This means in practice, that colon...

[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 28e5a54acb7c5ed893667a81eb2506d88cd32094..f928b35123ec1a20f374ab47746bce088eed8de7 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->WriteNumeric(482, "%s %s :Only channel operators may %sset channel mode +u", source->nick.c_str(), channel->name.c_str(), adding ? "" : "un");
+                               source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only channel operators may %sset channel mode +u", source->nick.c_str(), channel->name.c_str(), adding ? "" : "un");
                                return MODEACTION_DENY;
                        }
                        else
@@ -63,11 +63,11 @@ class ModuleAuditorium : public Module
 
                OnRehash(NULL, "");
 
-               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash };
-               Me->Modules->Attach(eventlist, this, 6);
+               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash, I_OnHostCycle };
+               Me->Modules->Attach(eventlist, this, 7);
 
        }
-       
+
        virtual ~ModuleAuditorium()
        {
                ServerInstance->Modes->DelMode(aum);
@@ -83,10 +83,10 @@ class ModuleAuditorium : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
-        virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
+       virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
        {
                if (!channel->IsModeSet('u'))
                        return;
@@ -96,7 +96,7 @@ class ModuleAuditorium : public Module
                        return;
 
                /* If user is oper and operoverride is on, don't touch the list */
-               if (OperOverride && IS_OPER(user))
+               if (OperOverride && user->HasPrivPermission("channels/auspex"))
                        return;
 
                if (ShowOps && (issuer != user) && (channel->GetStatus(user) < STATUS_OP))
@@ -113,7 +113,7 @@ class ModuleAuditorium : public Module
                        return;
                }
        }
-       
+
        virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
        {
                if (channel->IsModeSet('u'))
@@ -126,7 +126,7 @@ class ModuleAuditorium : public Module
                }
        }
 
-       void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
+       void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent)
        {
                if (channel->IsModeSet('u'))
                {
@@ -157,6 +157,15 @@ class ModuleAuditorium : public Module
                }
        }
 
+       bool OnHostCycle(User* user)
+       {
+               for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
+                       if (f->first->IsModeSet('u'))
+                               return true;
+
+               return false;
+       }
+
        void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
        {
                Command* parthandler = ServerInstance->Parser->GetHandler("PART");