Fix TBAN not working if the banner is owner/protected

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

diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 00bb859d4d3ae1c589f20a67426708987f04871e..638d1d29c7cd8562b4a055e99ed890021549dd0c 100644 (file)
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -13,11 +13,85 @@
 
 #include "inspircd.h"
 
+static void DisplayList(User* user, Channel* channel)
+{
+       std::stringstream items;
+       for(char letter = 'A'; letter <= 'z'; letter++)
+       {
+               ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_CHANNEL);
+               if (!mh || mh->IsListMode())
+                       continue;
+               if (!channel->IsModeSet(letter))
+                       continue;
+               items << " +" << mh->name;
+               if (mh->GetNumParams(true))
+                       items << " " << channel->GetModeParameter(letter);
+       }
+       char pfx[MAXBUF];
+       snprintf(pfx, MAXBUF, ":%s 961 %s %s", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), channel->name.c_str());
+       user->SendText(std::string(pfx), items);
+       user->WriteNumeric(960, "%s %s :End of mode list", user->nick.c_str(), channel->name.c_str());
+}
+
+class CommandProp : public Command
+{
+ public:
+       CommandProp(Module* parent) : Command(parent, "PROP", 1)
+       {
+               syntax = "<user|channel> {[+-]<mode> [<value>]}*";
+       }
+
+       CmdResult Handle(const std::vector<std::string> &parameters, User *src)
+       {
+               if (parameters.size() == 1)
+               {
+                       Channel* chan = ServerInstance->FindChan(parameters[0]);
+                       if (chan)
+                               DisplayList(src, chan);
+                       return CMD_SUCCESS;
+               }
+               unsigned int i = 1;
+               std::vector<std::string> modes;
+               modes.push_back(parameters[0]);
+               modes.push_back("");
+               while (i < parameters.size())
+               {
+                       std::string prop = parameters[i++];
+                       bool plus = prop[0] != '-';
+                       if (prop[0] == '+' || prop[0] == '-')
+                               prop.erase(prop.begin());
+
+                       for(char letter = 'A'; letter <= 'z'; letter++)
+                       {
+                               ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_CHANNEL);
+                               if (mh && mh->name == prop)
+                               {
+                                       modes[1].append((plus ? "+" : "-") + std::string(1, letter));
+                                       if (mh->GetNumParams(plus))
+                                       {
+                                               if (i != parameters.size())
+                                                       modes.push_back(parameters[i++]);
+                                       }
+                               }
+                       }
+               }
+               ServerInstance->SendGlobalMode(modes, src);
+               return CMD_SUCCESS;
+       }
+};
+
 class ModuleNamedModes : public Module
 {
+       CommandProp cmd;
  public:
-       ModuleNamedModes()
+       ModuleNamedModes() : cmd(this)
+       {
+       }
+
+       void init()
        {
+               ServerInstance->Modules->AddService(cmd);
+
                Implementation eventlist[] = { I_OnPreMode, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
@@ -44,27 +118,6 @@ class ModuleNamedModes : public Module
                }
        }
 
-       void DisplayList(User* user, Channel* channel)
-       {
-               std::stringstream items;
-               for(char letter = 'A'; letter <= 'z'; letter++)
-               {
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_CHANNEL);
-                       if (!mh || mh->IsListMode())
-                               continue;
-                       if (!channel->IsModeSet(letter))
-                               continue;
-                       std::string item = mh->name;
-                       if (mh->GetNumParams(true))
-                               item += "=" + channel->GetModeParameter(letter);
-                       items << item << " ";
-               }
-               char pfx[MAXBUF];
-               snprintf(pfx, MAXBUF, ":%s 961 %s %s", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), channel->name.c_str());
-               user->SendText(std::string(pfx), items);
-               user->WriteNumeric(960, "%s %s :End of mode list", user->nick.c_str(), channel->name.c_str());
-       }
-
        ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters)
        {
                if (!channel)
@@ -129,7 +182,7 @@ class ModuleNamedModes : public Module
                                if (modechar)
                                        modelist[i] = modechar;
                                else
-                                       modelist.erase(i, 1);
+                                       modelist.erase(i--, 1);
                        }
                        else if (mh && mh->GetNumParams(adding) && param_at < parameters.size())
                        {