Prevent using invalid UIDs and enforce UID/SID matching

[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 d4e5def632d4dffdce74cac4fe7085075730b6b2..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-2008 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.
@@ -14,43 +14,34 @@
 #include "inspircd.h"
 #include "m_cap.h"
 
-static const char* dummy = "ON";
-
 /* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
 
 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()
+       ~ModuleNamesX()
        {
        }
 
-       void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       Version GetVersion()
        {
-               if ((displayable) && (extname == "NAMESX"))
-                       proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
+               return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
        }
 
-       virtual Version GetVersion()
-       {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-       }
-
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::string &output)
        {
                output.append(" NAMESX");
        }
 
-       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, 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,63 +51,30 @@ class ModuleNamesX : public Module
                 */
                if (c == "PROTOCTL")
                {
-                       if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX")))
+                       if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
                        {
-                               user->Extend("NAMESX",dummy);
-                               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)
        {
-               if (ev->GetEventID() == "cap_req")
-               {
-                       CapData *data = (CapData *) ev->GetData();
-
-                       std::vector<std::string>::iterator it;
-                       if ((it = std::find(data->wanted.begin(), data->wanted.end(), "multi-prefix")) != data->wanted.end())
-                       {
-                               // we can handle this, so ACK it, and remove it from the wanted list
-                               data->ack.push_back(*it);
-                               data->wanted.erase(it);
-                               data->user->Extend("NAMESX",dummy);
-                       }
-               }
-
-               if (ev->GetEventID() == "cap_ls")
-               {
-                       CapData *data = (CapData *) ev->GetData();
-                       data->wanted.push_back("multi-prefix");
-               }
-
-               if (ev->GetEventID() == "cap_list")
-               {
-                       CapData *data = (CapData *) ev->GetData();
-
-                       if (data->user->GetExt("NAMESX"))
-                               data->wanted.push_back("multi-prefix");
-               }
-
-               if (ev->GetEventID() == "cap_clear")
-               {
-                       CapData *data = (CapData *) ev->GetData();
-                       data->ack.push_back("-multi-prefix");
-                       data->user->Shrink("NAMESX");
-               }
+               cap.HandleEvent(ev);
        }
 };