Don't execute multiple aliases after executing one.

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index b749b4788f9aab419b2ee497895fcfaeaa293610..5c06e8d08b765becc5fbb0e87847a497d7c1e552 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -158,16 +158,28 @@ void User::SetMode(unsigned char m, bool value)
        modes[m-65] = value;
 }
 
-const char* User::FormatModes()
+const char* User::FormatModes(bool showparameters)
 {
        static char data[MAXBUF];
+       std::string params;
        int offset = 0;
-       for (int n = 0; n < 64; n++)
+
+       for (unsigned char n = 0; n < 64; n++)
        {
                if (modes[n])
-                       data[offset++] = n+65;
+               {
+                       data[offset++] = n + 65;
+                       ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
+                       if (showparameters && mh && mh->GetNumParams(true))
+                       {
+                               std::string p = mh->GetUserParameter(this);
+                               if (p.length())
+                                       params.append(" ").append(p);
+                       }
+               }
        }
        data[offset] = 0;
+       strlcat(data, params.c_str(), MAXBUF);
        return data;
 }