Fix some of the include guard names (requested by SaberUK)

[user/henk/code/inspircd.git] / src / modules / m_namesx.cpp

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 33e82c3a775b01a0ae95e328c2bd46d228eb7e46..ec117e095d8265886d9df9f42fcc6e7459804da7 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,36 +19,29 @@
 class ModuleNamesX : public Module
 {
  public:
-
-       ModuleNamesX(InspIRCd* Me)
-               : Module(Me)
+       GenericCap cap;
+       ModuleNamesX() : cap(this, "multi-prefix")
        {
-               Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
 
-       virtual ~ModuleNamesX()
-       {
-       }
-
-       void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       ~ModuleNamesX()
        {
-               if ((displayable) && (extname == "NAMESX"))
-                       proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("$Id$",VF_VENDOR,API_VERSION);
+               return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::string &output)
        {
                output.append(" NAMESX");
        }
 
-       virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
        {
                irc::string c = command.c_str();
                /* We don't actually create a proper command handler class for PROTOCTL,
@@ -60,28 +53,28 @@ class ModuleNamesX : public Module
                {
                        if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
                        {
-                               user->Extend("NAMESX");
-                               return 1;
+                               cap.ext.set(user, 1);
+                               return MOD_RES_DENY;
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
+       void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
        {
-               if (!issuer->GetExt("NAMESX"))
+               if (!cap.ext.get(issuer))
                        return;
 
                /* Some module hid this from being displayed, dont bother */
                if (nick.empty())
                        return;
 
-               prefixes = channel->GetAllPrefixChars(user);
+               prefixes = memb->chan->GetAllPrefixChars(memb->user);
        }
 
-       virtual void OnEvent(Event *ev)
+       void OnEvent(Event& ev)
        {
-               GenericCapHandler(ev, "NAMESX", "multi-prefix");
+               cap.HandleEvent(ev);
        }
 };