Whoops, make /stats s work

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

diff --git a/src/mode.cpp b/src/mode.cpp
index ddc2d4d16c573fbc461b65a1be72d5a59516745e..c07682bcfc3e4ffbfbeabb0889d185ed8f18af36 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -269,7 +269,11 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
        chanrec* targetchannel = ServerInstance->FindChan(parameters[0]);
        userrec* targetuser  = ServerInstance->FindNick(parameters[0]);
 
-       ServerInstance->Log(DEBUG,"ModeParser::Process start");
+       ServerInstance->Log(DEBUG,"ModeParser::Process start: pcnt=%d",pcnt);
+       for (int j = 0; j < pcnt; j++)
+               ServerInstance->Log(DEBUG,"    parameters[%d] = '%s'", j, parameters[j]);
+
+       LastParse = "";
 
        /* Special case for displaying the list for listmodes,
         * e.g. MODE #chan b, or MODE #chan +b without a parameter
@@ -416,6 +420,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                                                /* This mode expects a parameter, do we have any parameters left in our list to use? */
                                                                if (parameter_counter < pcnt)
                                                                {
+                                                                       ServerInstance->Log(DEBUG,"parameter_counter = %d, pcnt = %d", parameter_counter, pcnt);
                                                                        parameter = parameters[parameter_counter++];
 
                                                                        /* Yerk, invalid! */
@@ -510,17 +515,11 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                {
                                        targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name, output_sequence.c_str(), parameter_list.str().c_str());
                                        this->LastParse = targetchannel->name;
-                                       LastParse.append(" ");
-                                       LastParse.append(output_sequence);
-                                       LastParse.append(parameter_list.str());
                                }
                                else
                                {
                                        targetuser->WriteServ("MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
                                        this->LastParse = targetuser->nick;
-                                       LastParse.append(" ");
-                                       LastParse.append(output_sequence);
-                                       LastParse.append(parameter_list.str());
                                }
                        }
                        else
@@ -531,20 +530,18 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                        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()));
                                        this->LastParse = targetchannel->name;
-                                       LastParse.append(" ");
-                                       LastParse.append(output_sequence);
-                                       LastParse.append(parameter_list.str());
                                }
                                else
                                {
                                        user->WriteTo(targetuser,"MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
-                                       FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence));
+                                       FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence + parameter_list.str()));
                                        this->LastParse = targetuser->nick;
-                                       LastParse.append(" ");
-                                       LastParse.append(output_sequence);
-                                       LastParse.append(parameter_list.str());
                                }
                        }
+
+                       LastParse.append(" ");
+                       LastParse.append(output_sequence);
+                       LastParse.append(parameter_list.str());
                }
        }
 }
@@ -732,6 +729,9 @@ std::string ModeParser::ModeString(userrec* user, chanrec* channel)
        std::string types;
        std::string pars;
 
+       if (!channel || !user)
+               return "";
+
        for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
                unsigned char pos = (mode-65) | MASK_CHANNEL;
@@ -740,7 +740,7 @@ std::string ModeParser::ModeString(userrec* user, chanrec* channel)
                {
                        ModePair ret;
                        ret = mh->ModeSet(NULL, user, channel, user->nick);
-                       if (ret.first)
+                       if ((ret.first) && (ret.second == user->nick))
                        {
                                pars.append(" ");
                                pars.append(user->nick);
@@ -862,7 +862,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
        if (!mw)
                return false;
 
-       if ((mw->GetModeType() < 'A') || (mw->GetModeType() > 'z'))
+       if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z'))
                return false;
 
        mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
@@ -871,7 +871,10 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
        ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw);
 
        if (a == modewatchers[pos].end())
+       {
+               ServerInstance->Log(DEBUG, "ModeParser::DelModeWatcher: Couldn't find watcher for mode %c in list", mw->GetModeChar());
                return false;
+       }
 
        modewatchers[pos].erase(a);
        ServerInstance->Log(DEBUG,"ModeParser::DelModeWatcher: stopped watching mode %c",mw->GetModeChar());
@@ -888,14 +891,8 @@ void ModeHandler::RemoveMode(userrec* user)
 
        if (user->IsModeSet(this->GetModeChar()))
        {
-               userrec* n = new userrec(ServerInstance);
-
                sprintf(moderemove,"-%c",this->GetModeChar());
-               n->SetFd(FD_MAGIC_NUMBER);
-
-               ServerInstance->SendMode(parameters, 2, n);
-
-               delete n;
+               ServerInstance->Parser->CallHandler("MODE", parameters, 2, user);
        }
 }
 
@@ -956,4 +953,3 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
        this->AddMode(new ModeUserOperator(Instance), 'o');
        this->AddMode(new ModeUserServerNoticeMask(Instance), 'n');
 }
-