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 1ba39b54a36cd83c77d310cce5a79f758dc99971..638d1d29c7cd8562b4a055e99ed890021549dd0c 100644 (file)
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -23,10 +23,9 @@ static void DisplayList(User* user, Channel* channel)
                        continue;
                if (!channel->IsModeSet(letter))
                        continue;
-               std::string item = mh->name;
+               items << " +" << mh->name;
                if (mh->GetNumParams(true))
-                       item += "=" + channel->GetModeParameter(letter);
-               items << item << " ";
+                       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());
@@ -70,9 +69,8 @@ class CommandProp : public Command
                                        modes[1].append((plus ? "+" : "-") + std::string(1, letter));
                                        if (mh->GetNumParams(plus))
                                        {
-                                               if (i == parameters.size())
-                                                       return CMD_FAILURE;
-                                               modes.push_back(parameters[i++]);
+                                               if (i != parameters.size())
+                                                       modes.push_back(parameters[i++]);
                                        }
                                }
                        }
@@ -93,6 +91,7 @@ class ModuleNamedModes : public Module
        void init()
        {
                ServerInstance->Modules->AddService(cmd);
+
                Implementation eventlist[] = { I_OnPreMode, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }