Only valid targets for encap are now server ids

[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 06aaf38e699f24d4205363db1a347f186bc50d14..7c60548e1593aa27543f4074155502b031b985d3 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-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,7 +20,7 @@ class AuditoriumMode : public ModeHandler
  public:
        AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (channel->IsModeSet('u') != adding)
                {
@@ -47,6 +47,7 @@ class ModuleAuditorium : public Module
  private:
        AuditoriumMode* aum;
        bool ShowOps;
+       bool OperOverride;
        CUList nl;
        CUList except_list;
  public:
@@ -54,31 +55,30 @@ class ModuleAuditorium : public Module
                : Module(Me)
        {
                aum = new AuditoriumMode(ServerInstance);
-               if (!ServerInstance->AddMode(aum))
+               if (!ServerInstance->Modes->AddMode(aum))
+               {
+                       delete aum;
                        throw ModuleException("Could not add new modes!");
+               }
 
                OnRehash(NULL, "");
 
-               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnUserList, I_OnRehash };
-               Me->Modules->Attach(eventlist, this, sizeof(eventlist));
+               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash };
+               Me->Modules->Attach(eventlist, this, 6);
+
        }
        
        virtual ~ModuleAuditorium()
        {
                ServerInstance->Modes->DelMode(aum);
-               DELETE(aum);
-       }
-
-       void Prioritize()
-       {
-               Module* namesx = ServerInstance->Modules->Find("m_namesx.so");
-               ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIO_BEFORE, &namesx);
+               delete aum;
        }
 
        virtual void OnRehash(User* user, const std::string &parameter)
        {
                ConfigReader conf(ServerInstance);
                ShowOps = conf.ReadFlag("auditorium", "showops", 0);
+               OperOverride = conf.ReadFlag("auditorium", "operoverride", 0);
        }
 
        virtual Version GetVersion()
@@ -86,39 +86,35 @@ class ModuleAuditorium : public Module
                return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
-       virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
+        virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
        {
-               if (Ptr->IsModeSet('u'))
+               if (!channel->IsModeSet('u'))
+                       return;
+
+               /* Some module hid this from being displayed, dont bother */
+               if (nick.empty())
+                       return;
+
+               /* If user is oper and operoverride is on, don't touch the list */
+               if (OperOverride && IS_OPER(user))
+                       return;
+
+               if (ShowOps && (issuer != user) && (channel->GetStatus(user) < STATUS_OP))
                {
-                       if (ShowOps)
-                       {
-                               /* Leave the names list alone, theyre an op
-                                * doing /names on the channel after joining it
-                                */
-                               if (Ptr->GetStatus(user) >= STATUS_OP)
-                               {
-                                       nameslist = Ptr->GetUsers();
-                                       return 0;
-                               }
-
-                               /* Show all the opped users */
-                               nl = *(Ptr->GetOppedUsers());
-                               nl[user] = user->nick;
-                               nameslist = &nl;
-                               return 0;
-                       }
-                       else
-                       {
-                               /* HELLOOO, IS ANYBODY THERE? -- nope, just us. */
-                               user->WriteServ("353 %s %c %s :%s", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name, user->nick);
-                               user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-                               return 1;
-                       }
+                       /* Showops is set, hide all non-ops from the user, except themselves */
+                       nick.clear();
+                       return;
+               }
+
+               if (!ShowOps && (issuer != user))
+               {
+                       /* ShowOps is not set, hide everyone except the user whos requesting NAMES */
+                       nick.clear();
+                       return;
                }
-               return 0;
        }
        
-       virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
+       virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
        {
                if (channel->IsModeSet('u'))
                {