Fix --with-max-clients not taking a parameter (reported by erich)

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

diff --git a/src/mode.cpp b/src/mode.cpp
index 560bd8d04fd52121ca2fe9d7179a6b74ff466644..dfa846364f95366e969ec67cae99346fc750f17f 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                      E-mail:
- *             <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include "inspircd.h"
 #include "users.h"
 #include "modules.h"
@@ -175,31 +170,28 @@ const char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
        if (!chan)
                return "";
 
-       for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
+       UCListIter n = d->chans.find(chan);
+       if (n != d->chans.end())
        {
-               ucrec* n = (ucrec*)(*i);
-               if (n->channel == chan)
+               if (n->second & MASK)
                {
-                       if (n->uc_modes & MASK)
-                       {
-                               return "";
-                       }
-                       n->uc_modes = n->uc_modes | MASK;
-                       switch (MASK)
-                       {
-                               case UCMODE_OP:
-                                       n->channel->AddOppedUser(d);
-                               break;
-                               case UCMODE_HOP:
-                                       n->channel->AddHalfoppedUser(d);
-                               break;
-                               case UCMODE_VOICE:
-                                       n->channel->AddVoicedUser(d);
-                               break;
-                       }
-                       ServerInstance->Log(DEBUG,"grant: %s %s",n->channel->name,d->nick);
-                       return d->nick;
+                       return "";
                }
+               n->second = n->second | MASK;
+               switch (MASK)
+               {
+                       case UCMODE_OP:
+                               n->first->AddOppedUser(d);
+                       break;
+                       case UCMODE_HOP:
+                               n->first->AddHalfoppedUser(d);
+                       break;
+                       case UCMODE_VOICE:
+                               n->first->AddVoicedUser(d);
+                       break;
+               }
+               ServerInstance->Log(DEBUG,"grant: %s %s",n->first->name,d->nick);
+               return d->nick;
        }
        return "";
 }
@@ -209,31 +201,28 @@ const char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
        if (!chan)
                return "";
 
-       for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
+       UCListIter n = d->chans.find(chan);
+       if (n != d->chans.end())
        {
-               ucrec* n = (ucrec*)(*i);
-               if (n->channel == chan)
+               if ((n->second & MASK) == 0)
                {
-                       if ((n->uc_modes & MASK) == 0)
-                       {
-                               return "";
-                       }
-                       n->uc_modes ^= MASK;
-                       switch (MASK)
-                       {
-                               case UCMODE_OP:
-                                       n->channel->DelOppedUser(d);
-                               break;
-                               case UCMODE_HOP:
-                                       n->channel->DelHalfoppedUser(d);
-                               break;
-                               case UCMODE_VOICE:
-                                       n->channel->DelVoicedUser(d);
-                               break;
-                       }
-                       ServerInstance->Log(DEBUG,"revoke: %s %s",n->channel->name,d->nick);
-                       return d->nick;
+                       return "";
+               }
+               n->second ^= MASK;
+               switch (MASK)
+               {
+                       case UCMODE_OP:
+                               n->first->DelOppedUser(d);
+                       break;
+                       case UCMODE_HOP:
+                               n->first->DelHalfoppedUser(d);
+                       break;
+                       case UCMODE_VOICE:
+                               n->first->DelVoicedUser(d);
+                       break;
                }
+               ServerInstance->Log(DEBUG,"revoke: %s %s",n->first->name,d->nick);
+               return d->nick;
        }
        return "";
 }
@@ -260,6 +249,7 @@ void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec
                else
                {
                        user->WriteServ("502 %s :Can't change mode for other users", user->nick);
+                       return;
                }
        }
 
@@ -277,8 +267,6 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
        userrec* targetuser  = ServerInstance->FindNick(parameters[0]);
 
        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 = "";
 
@@ -289,14 +277,23 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
        {
                ServerInstance->Log(DEBUG,"Spool list");
                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()))
+
+               while (mode && *mode)
                {
-                       mh->DisplayList(user, targetchannel);
-                       return;
+                       if (*mode == '+')
+                       {
+                               mode++;
+                               continue;
+                       }
+
+                       ModeHandler *mh = this->FindMode(*mode, MODETYPE_CHANNEL);
+
+                       if ((mh) && (mh->IsListMode()))
+                       {
+                               mh->DisplayList(user, targetchannel);
+                       }
+
+                       mode++;
                }
        }
 
@@ -377,8 +374,6 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                {
                        unsigned char modechar = *letter;
 
-                       ServerInstance->Log(DEBUG,"Process letter %c", modechar);
-
                        switch (modechar)
                        {
                                /* NB:
@@ -610,8 +605,9 @@ bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
 
        /* A mode prefix of ',' is not acceptable, it would fuck up server to server.
         * A mode prefix of ':' will fuck up both server to server, and client to server.
+        * A mode prefix of '#' will mess up /whois and /privmsg
         */
-       if ((mh->GetPrefix() == ',') || (mh->GetPrefix() == ':'))
+       if ((mh->GetPrefix() == ',') || (mh->GetPrefix() == ':') || (mh->GetPrefix() == '#'))
                return false;
 
        mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
@@ -642,13 +638,13 @@ bool ModeParser::DelMode(ModeHandler* mh)
        switch (mh->GetModeType())
        {
                case MODETYPE_USER:
-                       for (user_hash::iterator i = ServerInstance->clientlist.begin(); i != ServerInstance->clientlist.end(); i++)
+                       for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
                        {
                                mh->RemoveMode(i->second);
                        }
                break;
                case MODETYPE_CHANNEL:
-                       for (chan_hash::iterator i = ServerInstance->chanlist.begin(); i != ServerInstance->chanlist.end(); i++)
+                       for (chan_hash::iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
                        {
                                mh->RemoveMode(i->second);
                        }