Merge insp20

[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 1735df924298c4bdb70e5a6ef4d19574a5dc09ef..617ee43b368f5a3f6f48e588e4ab15ea5f227b35 100644 (file)
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -30,7 +30,12 @@ static void DisplayList(User* user, Channel* channel)
                        continue;
                items << " +" << mh->name;
                if (mh->GetNumParams(true))
-                       items << " " << channel->GetModeParameter(mh);
+               {
+                       if ((mh->name == "key") && (!channel->HasUser(user)) && (!user->HasPrivPermission("channels/auspex")))
+                               items << " <key>";
+                       else
+                               items << " " << channel->GetModeParameter(mh);
+               }
        }
        const std::string line = ":" + ServerInstance->Config->ServerName + " 961 " + user->nick + " " + channel->name;
        user->SendText(line, items);
@@ -64,6 +69,8 @@ class CommandProp : public Command
                while (i < parameters.size())
                {
                        std::string prop = parameters[i++];
+                       if (prop.empty())
+                               continue;
                        bool plus = prop[0] != '-';
                        if (prop[0] == '+' || prop[0] == '-')
                                prop.erase(prop.begin());