m_check: Fix showing oper permissions (privileges). (#1556)

[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 f211b01d88a75af838c527b283ef68c81517750d..defb66b7848d029ccd441537e734d2ebbbaa53d4 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -22,12 +22,19 @@
 
 #include "inspircd.h"
 #include "modules/cap.h"
+#include "modules/who.h"
 
-class ModuleNamesX : public Module
+class ModuleNamesX
+       : public Module
+       , public Who::EventListener
 {
-       GenericCap cap;
+ private:
+       Cap::Capability cap;
+
  public:
-       ModuleNamesX() : cap(this, "multi-prefix")
+       ModuleNamesX()
+               : Who::EventListener(this)
+               , cap(this, "multi-prefix")
        {
        }
 
@@ -41,7 +48,7 @@ class ModuleNamesX : public Module
                tokens["NAMESX"];
        }
 
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                /* We don't actually create a proper command handler class for PROTOCTL,
                 * because other modules might want to have PROTOCTL hooks too.
@@ -52,7 +59,7 @@ class ModuleNamesX : public Module
                {
                        if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
                        {
-                               cap.ext.set(user, 1);
+                               cap.set(user, true);
                                return MOD_RES_DENY;
                        }
                }
@@ -61,43 +68,45 @@ class ModuleNamesX : public Module
 
        ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
        {
-               if (cap.ext.get(issuer))
+               if (cap.get(issuer))
                        prefixes = memb->GetAllPrefixChars();
 
                return MOD_RES_PASSTHRU;
        }
 
-       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+       ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
        {
-               if ((!memb) || (!cap.ext.get(source)))
-                       return;
-
-               // Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
-               // only ever valid after whitespace, so... find the actual delimiter first!
-               // Thanks to FxChiP for pointing this out.
-               std::string::size_type pos = line.find(" :");
-               if (pos == std::string::npos || pos == 0)
-                       return;
-               pos--;
-               // Don't do anything if the user has no prefixes
-               if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*'))
-                       return;
-
-               // 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
-               //                                                            pos
+               if ((!memb) || (!cap.get(source)))
+                       return MOD_RES_PASSTHRU;
 
                // Don't do anything if the user has only one prefix
                std::string prefixes = memb->GetAllPrefixChars();
                if (prefixes.length() <= 1)
-                       return;
+                       return MOD_RES_PASSTHRU;
 
-               line.erase(pos, 1);
-               line.insert(pos, prefixes);
-       }
+               size_t flag_index = 5;
+               if (request.whox)
+               {
+                       // We only need to fiddle with the flags if they are present.
+                       if (!request.whox_fields['f'])
+                               return MOD_RES_PASSTHRU;
 
-       void OnEvent(Event& ev) CXX11_OVERRIDE
-       {
-               cap.HandleEvent(ev);
+                       // WHOX makes this a bit tricky as we need to work out the parameter which the flags are in.
+                       flag_index = 0;
+                       static const char* flags = "tcuihsn";
+                       for (size_t i = 0; i < strlen(flags); ++i)
+                       {
+                               if (request.whox_fields[flags[i]])
+                                       flag_index += 1;
+                       }
+               }
+
+               // #chan ident localhost insp22.test nick H@ :0 Attila
+               if (numeric.GetParams().size() <= flag_index)
+                       return MOD_RES_PASSTHRU;
+
+               numeric.GetParams()[flag_index].append(prefixes, 1, std::string::npos);
+               return MOD_RES_PASSTHRU;
        }
 };