Allow non-ops to view listmode lists

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

diff --git a/src/mode.cpp b/src/mode.cpp
index 34070e5a119aa8c6f291c59942544a764eecd5c0..31b90ed374499581a746d7c8543fcd0c3c97ab4e 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -113,7 +113,7 @@ ModeAction ModeHandler::OnModeChange(userrec* source, userrec* dest, chanrec* ch
        return MODEACTION_DENY;
 }
 
-std::pair<bool,std::string> ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
 {
        if (dest)
        {
@@ -277,6 +277,23 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
 
        log(DEBUG,"ModeParser::Process start");
 
+       /* Special case for displaying the list for listmodes,
+        * e.g. MODE #chan b, or MODE #chan +b without a parameter
+        */
+       if ((targetchannel) && (pcnt == 2))
+       {
+               const char* mode = parameters[1];
+               if (*mode == '+')
+               mode++;
+               unsigned char handler_id = ((*mode) - 65) | MASK_CHANNEL;
+               ModeHandler* mh = modehandlers[handler_id];
+               if ((mh) && (mh->IsListMode()))
+               {
+                       mh->DisplayList(user, targetchannel);
+               }
+               return;
+       }
+
        if (pcnt == 1)
        {
                this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]);
@@ -292,7 +309,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                         * (e.g. are they a (half)op?
                         */
 
-                       if (cstatus(user, targetchannel) < STATUS_HOP)
+                       if ((IS_LOCAL(user)) && (cstatus(user, targetchannel) < STATUS_HOP))
                        {
                                /* We don't have halfop */
                                log(DEBUG,"The user is not a halfop or above, checking other reasons for being able to set the modes");
@@ -321,24 +338,6 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                        return;
                }
 
-               /* Special case for displaying the list for listmodes,
-                * e.g. MODE #chan b, or MODE #chan +b without a parameter
-                */
-               if ((type== MODETYPE_CHANNEL) && (pcnt == 2))
-               {
-                       const char* mode = parameters[1];
-                       if (*mode == '+')
-                               mode++;
-
-                       unsigned char handler_id = ((*mode) - 65) | mask;
-                       ModeHandler* mh = modehandlers[handler_id];
-
-                       if ((mh) && (mh->IsListMode()))
-                       {
-                               mh->DisplayList(user, targetchannel);
-                       }
-               }
-               
                std::string mode_sequence = parameters[1];
                std::string parameter = "";
                std::ostringstream parameter_list;
@@ -574,6 +573,54 @@ ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt)
        return modehandlers[pos];
 }
 
+std::string ModeParser::UserModeList()
+{
+       char modestr[256];
+       int pointer = 0;
+
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | MASK_USER;
+
+               if (modehandlers[pos])
+                       modestr[pointer++] = mode;
+       }
+       modestr[pointer++] = 0;
+       return modestr;
+}
+
+std::string ModeParser::ChannelModeList()
+{
+       char modestr[256];
+       int pointer = 0;
+
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
+
+               if (modehandlers[pos])
+                       modestr[pointer++] = mode;
+       }
+       modestr[pointer++] = 0;
+       return modestr;
+}
+
+std::string ModeParser::ParaModeList()
+{
+       char modestr[256];
+       int pointer = 0;
+
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
+
+               if ((modehandlers[pos]) && (modehandlers[pos]->GetNumParams(true)))
+                       modestr[pointer++] = mode;
+       }
+       modestr[pointer++] = 0;
+       return modestr;
+}
+
 bool ModeParser::AddModeWatcher(ModeWatcher* mw)
 {
        unsigned char mask = 0;