Mark +P mode as oper-only now that it no longer requires an explicit permission string

[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 d27ccfaadc700382f113bf204c229b46fabc6548..4dec57df9460ad489ad5d8d5307c7069d2eccc05 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -18,7 +18,7 @@
 class AuditoriumMode : public ModeHandler
 {
  public:
-       AuditoriumMode(Module* Creator) : ModeHandler(Creator, 'u', PARAM_NONE, MODETYPE_CHANNEL)
+       AuditoriumMode(Module* Creator) : ModeHandler(Creator, "auditorium", 'u', PARAM_NONE, MODETYPE_CHANNEL)
        {
                levelrequired = OP_VALUE;
        }
@@ -52,8 +52,8 @@ class ModuleAuditorium : public Module
 
                OnRehash(NULL);
 
-               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash, I_OnHostCycle };
-               ServerInstance->Modules->Attach(eventlist, this, 7);
+               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 6);
 
        }
 
@@ -70,7 +70,7 @@ class ModuleAuditorium : public Module
 
        Version GetVersion()
        {
-               return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_VENDOR);
        }
 
        void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
@@ -137,34 +137,14 @@ class ModuleAuditorium : public Module
                BuildExcept(memb, excepts);
        }
 
-       ModResult OnHostCycle(User* user)
+       void OnBuildNeighborList(User* source, UserChanList &include, std::map<User*,bool> &exception)
        {
-               for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
-                       if ((*f)->IsModeSet('u'))
-                               return MOD_RES_DENY;
-
-               return MOD_RES_PASSTHRU;
-       }
-
-       void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
-       {
-               Command* parthandler = ServerInstance->Parser->GetHandler("PART");
-               std::vector<std::string> to_leave;
-               if (parthandler)
+               UCListIter i = include.begin();
+               while (i != include.end())
                {
-                       for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
-                       {
-                               if ((*f)->IsModeSet('u'))
-                                       to_leave.push_back((*f)->name);
-                       }
-                       /* 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++)
-                       {
-                               std::vector<std::string> parameters;
-                               parameters.push_back(*n);
-                               /* This triggers our OnUserPart, above, making the PART silent */
-                               parthandler->Handle(parameters, user);
-                       }
+                       Channel* c = *i++;
+                       if (c->IsModeSet('u'))
+                               include.erase(c);
                }
        }
 };