Fixed bug #437 (Empty userstats setting denies stats to opers too)

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 6ba5aaa5f857021ef3f13d5ba622c0734dce8f9a..5169fbf6372161a77b83541393fe0a05d14ac519 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -13,9 +13,6 @@
 
 #include "inspircd.h"
 #include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "mode.h"
 
@@ -175,10 +172,10 @@ CUList* chanrec::GetVoicedUsers()
 void chanrec::SetDefaultModes()
 {
        irc::spacesepstream list(ServerInstance->Config->DefaultModes);
-       std::string modeseq = list.GetToken();
+       std::string modeseq;
        std::string parameter;
-       userrec* dummyuser = new userrec(ServerInstance);
-       dummyuser->SetFd(FD_MAGIC_NUMBER);
+
+       list.GetToken(modeseq);
 
        for (std::string::iterator n = modeseq.begin(); n != modeseq.end(); ++n)
        {
@@ -186,15 +183,13 @@ void chanrec::SetDefaultModes()
                if (mode)
                {
                        if (mode->GetNumParams(true))
-                               parameter = list.GetToken().c_str();
+                               list.GetToken(parameter);
                        else
                                parameter.clear();
 
-                       mode->OnModeChange(dummyuser, dummyuser, this, parameter, true);
+                       mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true);
                }
        }
-
-       delete dummyuser;
 }
 
 /* 
@@ -219,9 +214,9 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
         */
        if (IS_LOCAL(user) && !override)
        {
-               if (IS_OPER(user))
+               if (user->GetMaxChans())
                {
-                       if (user->chans.size() >= Instance->Config->OperMaxChans)
+                       if (user->chans.size() >= user->GetMaxChans())
                        {
                                user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
                                return NULL;
@@ -229,10 +224,21 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
                }
                else
                {
-                       if (user->chans.size() >= Instance->Config->MaxChans)
+                       if (IS_OPER(user))
                        {
-                               user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
-                               return NULL;
+                               if (user->chans.size() >= Instance->Config->OperMaxChans)
+                               {
+                                       user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+                                       return NULL;
+                               }
+                       }
+                       else
+                       {
+                               if (user->chans.size() >= Instance->Config->MaxChans)
+                               {
+                                       user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+                                       return NULL;
+                               }
                        }
                }
        }
@@ -356,11 +362,9 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 
 chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, const std::string &privs)
 {
-       userrec* dummyuser = new userrec(Instance);
        std::string nick = user->nick;
        bool silent = false;
 
-       dummyuser->SetFd(FD_MAGIC_NUMBER);
        Ptr->AddUser(user);
 
        /* Just in case they have no permissions */
@@ -374,7 +378,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con
                {
                        Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
                        /* Make sure that the mode handler knows this mode was now set */
-                       mh->OnModeChange(dummyuser, dummyuser, Ptr, nick, true);
+                       mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true);
 
                        switch (mh->GetPrefix())
                        {
@@ -399,8 +403,6 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con
                }
        }
 
-       delete dummyuser;
-
        FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, silent));
 
        if (!silent)
@@ -832,7 +834,7 @@ void chanrec::UserList(userrec *user, CUList *ulist)
        if (MOD_RESULT == 1)
                return;
 
-       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
+       dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=',  this->name);
 
        int numusers = 0;
        char* ptr = list + dlen;
@@ -874,7 +876,7 @@ void chanrec::UserList(userrec *user, CUList *ulist)
                        user->WriteServ(std::string(list));
 
                        /* reset our lengths */
-                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
+                       dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
                        ptr = list + dlen;
 
                        ptrlen = 0;