Remove the size argument from IsChannel and IsNick.

[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 e55aa84a4b597bfa922c4d464fe7353c669386c2..86fdad78591e2fbbf013620a22873190e7977405 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list */
@@ -34,31 +43,30 @@ class AuditoriumMode : public ModeHandler
 
 class ModuleAuditorium : public Module
 {
- private:
        AuditoriumMode aum;
        bool OpsVisible;
        bool OpsCanSee;
        bool OperCanSee;
+
  public:
        ModuleAuditorium() : aum(this)
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(aum);
 
                OnRehash(NULL);
 
-               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 6);
+               Implementation eventlist[] = {
+                       I_OnUserJoin, I_OnUserPart, I_OnUserKick,
+                       I_OnBuildNeighborList, I_OnNamesListItem, I_OnSendWhoLine,
+                       I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       ~ModuleAuditorium()
-       {
-       }
-
-       void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("auditorium");
                OpsVisible = tag->getBool("opvisible");
@@ -66,7 +74,7 @@ class ModuleAuditorium : public Module
                OperCanSee = tag->getBool("opercansee", true);
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_VENDOR);
        }
@@ -100,7 +108,7 @@ class ModuleAuditorium : public Module
                return false;
        }
 
-       void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
+       void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) CXX11_OVERRIDE
        {
                // Some module already hid this from being displayed, don't bother
                if (nick.empty())
@@ -129,22 +137,22 @@ class ModuleAuditorium : public Module
                }
        }
 
-       void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
+       void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE
        {
                BuildExcept(memb, excepts);
        }
 
-       void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts)
+       void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE
        {
                BuildExcept(memb, excepts);
        }
 
-       void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
+       void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE
        {
                BuildExcept(memb, excepts);
        }
 
-       void OnBuildNeighborList(User* source, UserChanList &include, std::map<User*,bool> &exception)
+       void OnBuildNeighborList(User* source, UserChanList &include, std::map<User*,bool> &exception) CXX11_OVERRIDE
        {
                UCListIter i = include.begin();
                while (i != include.end())
@@ -157,13 +165,26 @@ class ModuleAuditorium : public Module
                        include.erase(c);
                        // however, that might hide me from ops that can see me...
                        const UserMembList* users = c->GetUsers();
-                       for(UserMembCIter i = users->begin(); i != users->end(); i++)
+                       for(UserMembCIter j = users->begin(); j != users->end(); j++)
                        {
-                               if (IS_LOCAL(i->first) && CanSee(i->first, memb))
-                                       exception[i->first] = true;
+                               if (IS_LOCAL(j->first) && CanSee(j->first, memb))
+                                       exception[j->first] = true;
                        }
                }
        }
+
+       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line) CXX11_OVERRIDE
+       {
+               Channel* channel = ServerInstance->FindChan(params[0]);
+               if (!channel)
+                       return;
+               Membership* memb = channel->GetUser(user);
+               if (IsVisible(memb))
+                       return;
+               if (CanSee(source, memb))
+                       return;
+               line.clear();
+       }
 };
 
 MODULE_INIT(ModuleAuditorium)