]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/mode.cpp
Fix passing wrong instance to resolver
[user/henk/code/inspircd.git] / src / mode.cpp
index 791d0f897023d7c23b731628e1ad8734ccb59140..7747664ac387ebf06f01367279fc8d56e959d127 100644 (file)
@@ -69,8 +69,8 @@ using namespace std;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
+
 extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
 
 extern time_t TIME;
 
@@ -113,6 +113,18 @@ ModeAction ModeHandler::OnModeChange(userrec* source, userrec* dest, chanrec* ch
        return MODEACTION_DENY;
 }
 
+ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+{
+       if (dest)
+       {
+               return std::make_pair(dest->IsModeSet(this->mode), "");
+       }
+       else
+       {
+               return std::make_pair(channel->IsModeSet(this->mode), "");
+       }
+}
+
 void ModeHandler::DisplayList(userrec* user, chanrec* channel)
 {
 }
@@ -159,7 +171,7 @@ userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,i
        d = Find(dest);
        if (!d)
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
+               user->WriteServ("401 %s %s :No such nick/channel",user->nick, dest);
                return NULL;
        }
        return d;
@@ -238,24 +250,24 @@ void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec
        if (targetchannel)
        {
                /* Display channel's current mode string */
-               WriteServ(user->fd,"324 %s %s +%s",user->nick, targetchannel->name, chanmodes(targetchannel, targetchannel->HasUser(user)));
-               WriteServ(user->fd,"329 %s %s %d", user->nick, targetchannel->name, targetchannel->created);
+               user->WriteServ("324 %s %s +%s",user->nick, targetchannel->name, chanmodes(targetchannel, targetchannel->HasUser(user)));
+               user->WriteServ("329 %s %s %d", user->nick, targetchannel->name, targetchannel->created);
                return;
        }
        else if (targetuser)
        {
                /* Display user's current mode string */
-               WriteServ(user->fd,"221 %s :+%s",targetuser->nick,targetuser->FormatModes());
-               WriteServ(user->fd, "008 %s :+%s", targetuser->nick, targetuser->FormatNoticeMasks());
+               user->WriteServ("221 %s :+%s",targetuser->nick,targetuser->FormatModes());
+               user->WriteServ("008 %s :+%s", targetuser->nick, targetuser->FormatNoticeMasks());
                return;
        }
 
        /* No such nick/channel */
-       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, text);
+       user->WriteServ("401 %s %s :No such nick/channel",user->nick, text);
        return;
 }
 
-void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool servermode)
+void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool servermode)
 {
        std::string target = parameters[0];
        ModeType type = MODETYPE_USER;
@@ -265,6 +277,23 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
 
        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]);
@@ -280,7 +309,7 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                         * (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");
@@ -292,7 +321,7 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                                         * NOT a uline and NOT a servermode,
                                         * OR, NOT halfop or above.
                                         */
-                                       WriteServ(user->fd,"482 %s %s :You're not a channel (half)operator",user->nick, targetchannel->name);
+                                       user->WriteServ("482 %s %s :You're not a channel (half)operator",user->nick, targetchannel->name);
                                        return;
                                }
                        }
@@ -305,28 +334,10 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                else
                {
                        /* No such nick/channel */
-                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                       user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                        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))
-               {
-                       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;
@@ -444,7 +455,7 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                                        else
                                        {
                                                /* No mode handler? Unknown mode character then. */
-                                               WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick, modechar);
+                                               user->WriteServ("472 %s %c :is unknown mode char to me",user->nick, modechar);
                                        }
                                break;
                        }
@@ -456,11 +467,11 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                        {
                                if (type == MODETYPE_CHANNEL)
                                {
-                                       WriteChannelWithServ(Config->ServerName,targetchannel,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
+                                       targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name, output_sequence.c_str(), parameter_list.str().c_str());
                                }
                                else
                                {
-                                       WriteServ(targetuser->fd,"MODE %s %s",targetuser->nick,output_sequence.c_str());
+                                       targetuser->WriteServ("MODE %s %s",targetuser->nick,output_sequence.c_str());
                                }
                        }
                        else
@@ -468,12 +479,12 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                                if (type == MODETYPE_CHANNEL)
                                {
                                        log(DEBUG,"Write output sequence and parameters to channel: %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
-                                       WriteChannel(targetchannel,user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
+                                       targetchannel->WriteChannel(user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
                                        FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str()));
                                }
                                else
                                {
-                                       WriteTo(user,targetuser,"MODE %s %s",targetuser->nick,output_sequence.c_str());
+                                       user->WriteTo(targetuser,"MODE %s %s",targetuser->nick,output_sequence.c_str());
                                        FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence));
                                }
                        }
@@ -482,7 +493,7 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
 }
 
 
-void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_mode::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (!user)
                return;
@@ -548,6 +559,68 @@ bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
        return true;
 }
 
+ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
+
+       if ((modeletter < 'A') || (modeletter > 'z'))
+               return NULL;
+
+       mt == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (modeletter-65) | mask;
+
+       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;