OnRehash changes: split to multiple hooks to clarify use and prevent explosion of...

[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 6563cd3bebb8a8231861e1cae557247104c53e02..3abcdd23765a442f0620289f68420aa41746550c 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -48,8 +48,6 @@ class ModuleAuditorium : public Module
        AuditoriumMode* aum;
        bool ShowOps;
        bool OperOverride;
-       CUList nl;
-       CUList except_list;
  public:
        ModuleAuditorium(InspIRCd* Me)
                : Module(Me)
@@ -61,10 +59,10 @@ class ModuleAuditorium : public Module
                        throw ModuleException("Could not add new modes!");
                }
 
-               OnRehash(NULL, "");
+               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);
 
        }
 
@@ -74,7 +72,7 @@ class ModuleAuditorium : public Module
                delete aum;
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ConfigReader conf(ServerInstance);
                ShowOps = conf.ReadFlag("auditorium", "showops", 0);
@@ -83,7 +81,7 @@ 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)
@@ -96,7 +94,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 && issuer->HasPrivPermission("channels/auspex"))
                        return;
 
                if (ShowOps && (issuer != user) && (channel->GetStatus(user) < STATUS_OP))
@@ -114,6 +112,20 @@ class ModuleAuditorium : public Module
                }
        }
 
+       void WriteOverride(User* source, Channel* channel, const std::string &text)
+       {
+               if (!OperOverride)
+                       return;
+
+               CUList *ulist = channel->GetUsers();
+               for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+               {
+                       if (i->first->HasPrivPermission("channels/auspex") && source != i->first)
+                               if (!ShowOps || (ShowOps && channel->GetStatus(i->first) < STATUS_OP))
+                                       i->first->WriteFrom(source, "%s",text.c_str());
+               }
+       }
+
        virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
        {
                if (channel->IsModeSet('u'))
@@ -122,7 +134,8 @@ class ModuleAuditorium : public Module
                        /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */
                        user->WriteFrom(user, "JOIN %s", channel->name.c_str());
                        if (ShowOps)
-                               channel->WriteAllExcept(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', except_list, "JOIN %s", channel->name.c_str());
+                               channel->WriteAllExceptSender(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', "JOIN %s", channel->name.c_str());
+                       WriteOverride(user, channel, "JOIN "+channel->name);
                }
        }
 
@@ -137,9 +150,10 @@ class ModuleAuditorium : public Module
                                        partmessage.empty() ? "" : partmessage.c_str());
                        if (ShowOps)
                        {
-                               channel->WriteAllExcept(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', except_list, "PART %s%s%s", channel->name.c_str(), partmessage.empty() ? "" : " :",
+                               channel->WriteAllExceptSender(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', "PART %s%s%s", channel->name.c_str(), partmessage.empty() ? "" : " :",
                                                partmessage.empty() ? "" : partmessage.c_str());
                        }
+                       WriteOverride(user, channel, "PART " + channel->name + (partmessage.empty() ? "" : (" :" + partmessage)));
                }
        }
 
@@ -151,12 +165,22 @@ class ModuleAuditorium : public Module
                        /* Send silenced event only to the user being kicked and the user doing the kick */
                        source->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str());
                        if (ShowOps)
-                               chan->WriteAllExcept(source, false, chan->GetStatus(source) >= STATUS_OP ? 0 : '@', except_list, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str());
-                       else
+                               chan->WriteAllExceptSender(source, false, chan->GetStatus(user) >= STATUS_OP ? 0 : '@', "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str());
+                       if ((!ShowOps) || (chan->GetStatus(user) < STATUS_OP)) /* make sure the target gets the event */
                                user->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str());
+                       WriteOverride(source, chan, "KICK " + chan->name + " " + user->nick + " " + reason);
                }
        }
 
+       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");