Also use freenode's 470 numeric in m_banredirect.

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 2dc668f3140a35ce85a1f7f5a53d04e95c3f868e..7374f091e80997f1abbe9d6939b5abfd90a7a3ab 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -15,7 +15,6 @@
 
 #include "inspircd.h"
 #include <cstdarg>
-#include "wildcard.h"
 #include "mode.h"
 
 Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
@@ -75,7 +74,7 @@ std::string Channel::GetModeParameter(char mode)
 
 int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
 {
-       if (IS_LOCAL(u))
+       if (u && IS_LOCAL(u))
        {
                if(!forceset)
                {
@@ -100,15 +99,23 @@ int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
                                }
                        }
                }
+       }
 
-               this->topic.assign(ntopic, 0, ServerInstance->Config->Limits.MaxTopic);
+       this->topic.assign(ntopic, 0, ServerInstance->Config->Limits.MaxTopic);
+       if (u)
+       {
+               this->setby.assign(ServerInstance->Config->FullHostInTopic ? u->GetFullHost() : u->nick, 0, 128);
+               this->WriteChannel(u, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
+       }
+       else
+       {
+               this->setby.assign(ServerInstance->Config->ServerName);
+               this->WriteChannelWithServ(ServerInstance->Config->ServerName, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
        }
 
-       this->setby.assign(ServerInstance->Config->FullHostInTopic ? u->GetFullHost() : u->nick, 0, 128);
        this->topicset = ServerInstance->Time();
-       this->WriteChannel(u, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
 
-       if (IS_LOCAL(u))
+       if (u && IS_LOCAL(u))
        {
                FOREACH_MOD(I_OnPostLocalTopicChange,OnPostLocalTopicChange(u, this, this->topic));
        }
@@ -269,7 +276,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
                }
                else
                {
-                       if (IS_OPER(user))
+                       if (user->HasPrivPermission("channels/high-join-limit"))
                        {
                                if (user->chans.size() >= Instance->Config->OperMaxChans)
                                {
@@ -337,32 +344,36 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
                        else if (MOD_RESULT == 0)
                        {
                                std::string ckey = Ptr->GetModeParameter('k');
+                               bool invited = user->IsInvited(Ptr->name.c_str());
+                               bool can_bypass = Instance->Config->InvBypassModes && invited;
+
                                if (!ckey.empty())
                                {
                                        MOD_RESULT = 0;
                                        FOREACH_RESULT_I(Instance, I_OnCheckKey, OnCheckKey(user, Ptr, key ? key : ""));
                                        if (!MOD_RESULT)
                                        {
-                                               if ((!key) || ckey != key)
+                                               // If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
+                                               if ((!key || ckey != key) && !can_bypass)
                                                {
                                                        user->WriteNumeric(ERR_BADCHANNELKEY, "%s %s :Cannot join channel (Incorrect channel key)",user->nick.c_str(), Ptr->name.c_str());
                                                        return NULL;
                                                }
                                        }
                                }
+
                                if (Ptr->IsModeSet('i'))
                                {
                                        MOD_RESULT = 0;
                                        FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr));
                                        if (!MOD_RESULT)
                                        {
-                                               if (!user->IsInvited(Ptr->name.c_str()))
+                                               if (!invited)
                                                {
                                                        user->WriteNumeric(ERR_INVITEONLYCHAN, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), Ptr->name.c_str());
                                                        return NULL;
                                                }
                                        }
-                                       user->RemoveInvite(Ptr->name.c_str());
                                }
 
                                std::string limit = Ptr->GetModeParameter('l');
@@ -373,7 +384,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
                                        if (!MOD_RESULT)
                                        {
                                                long llimit = atol(limit.c_str());
-                                               if (Ptr->GetUserCounter() >= llimit)
+                                               if (Ptr->GetUserCounter() >= llimit && !can_bypass)
                                                {
                                                        user->WriteNumeric(ERR_CHANNELISFULL, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), Ptr->name.c_str());
                                                        return NULL;
@@ -383,12 +394,21 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 
                                if (Ptr->bans.size())
                                {
-                                       if (Ptr->IsBanned(user))
+                                       if (Ptr->IsBanned(user) && !can_bypass)
                                        {
                                                user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)",user->nick.c_str(), Ptr->name.c_str());
                                                return NULL;
                                        }
                                }
+
+                               /*
+                                * If the user has invites for this channel, remove them now
+                                * after a successful join so they don't build up.
+                                */
+                               if (invited)
+                               {
+                                       user->RemoveInvite(Ptr->name.c_str());
+                               }
                        }
                }
        }
@@ -477,11 +497,9 @@ bool Channel::IsBanned(User* user)
                snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
                for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
                {
-                       /* This allows CIDR ban matching
-                        *
-                        *        Full masked host                      Full unmasked host                   IP with/without CIDR
-                        */
-                       if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true)))
+                       if ((InspIRCd::Match(user->GetFullHost(),i->data, NULL)) || // host
+                               (InspIRCd::Match(user->GetFullRealHost(),i->data, NULL)) || // uncloaked host
+                               (InspIRCd::MatchCIDR(mask, i->data, NULL))) // ip
                        {
                                return true;
                        }
@@ -508,7 +526,7 @@ bool Channel::IsExtBanned(const std::string &str, char type)
                        std::string maskptr = i->data.substr(2);
                        ServerInstance->Logs->Log("EXTBANS", DEBUG, "Checking %s against %s, type is %c", str.c_str(), maskptr.c_str(), type);
 
-                       if (match(str, maskptr))
+                       if (InspIRCd::Match(str, maskptr, NULL))
                                return true;
                }
        }
@@ -545,8 +563,6 @@ bool Channel::IsExtBanned(User *user, char type)
 /* Channel::PartUser
  * remove a channel from a users record, and return the number of users left.
  * Therefore, if this function returns 0 the caller should delete the Channel.
- *
- * XXX: bleh, string copy of reason, fixme! -- w00t
  */
 long Channel::PartUser(User *user, std::string &reason)
 {
@@ -990,7 +1006,7 @@ void Channel::UserList(User *user, CUList *ulist)
                if (curlen + prefixlist.length() + nick.length() + 1 > 480)
                {
                        /* list overflowed into multiple numerics */
-                       user->WriteServ(std::string(list));
+                       user->WriteNumeric(RPL_NAMREPLY, std::string(list));
 
                        /* reset our lengths */
                        dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick.c_str(), this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name.c_str());
@@ -1026,7 +1042,7 @@ long Channel::GetMaxBans()
        /* If there isnt one, we have to do some O(n) hax to find it the first time. (ick) */
        for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
        {
-               if (match(this->name,n->first))
+               if (InspIRCd::Match(this->name, n->first, NULL))
                {
                        this->maxbans = n->second;
                        return n->second;