Explicitly call the std::string version of WriteServ in chanrec::UserList to prevent...

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 780251f5f9c34bcb756a5275ffde9f48bc757d01..732b253cc7d4208cae31c1e6bcae1c7f4a9ef087 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -16,27 +16,13 @@
 
 using namespace std;
 
-#include <string>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include <stdarg.h>
 #include "configreader.h"
 #include "inspircd.h"
-#include "hash_map.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "commands.h"
 #include "wildcard.h"
 #include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-
-#include "typedefs.h"
 
 chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
 {
@@ -332,17 +318,10 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
                                        sprintf(mask,"%s!%s@%s",user->nick, user->ident, user->GetIPString());
                                        if (!MOD_RESULT)
                                        {
-                                               for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+                                               if (Ptr->IsBanned(user))
                                                {
-                                                       /* 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)))
-                                                       {
-                                                               user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
-                                                               return NULL;
-                                                       }
+                                                       user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+                                                       return NULL;
                                                }
                                        }
                                }
@@ -439,6 +418,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* u
 
        a->channel = Ptr;
        Ptr->AddUser(user);
+       user->ModChannelCount(1);
        Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
 
        /* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
@@ -455,6 +435,25 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* u
        return Ptr;
 }
 
+bool chanrec::IsBanned(userrec* user)
+{
+       char mask[MAXBUF];
+       sprintf(mask,"%s!%s@%s",user->nick, user->ident, 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)))
+               {
+                       return true;
+               }
+
+       }
+       return false;
+}
+
 /* chanrec::PartUser
  * remove a channel from a users record, and remove the record from the hash
  * if the channel has become empty
@@ -481,6 +480,7 @@ long chanrec::PartUser(userrec *user, const char* reason)
                        }
                        user->chans[i]->uc_modes = 0;
                        user->chans[i]->channel = NULL;
+                       user->ModChannelCount(-1);
                        this->RemoveAllPrefixes(user);
                        break;
                }
@@ -852,7 +852,7 @@ void chanrec::UserList(userrec *user)
                if (curlen > (480-NICKMAX))
                {
                        /* list overflowed into multiple numerics */
-                       user->WriteServ(list);
+                       user->WriteServ(std::string(list));
 
                        /* reset our lengths */
                        dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
@@ -866,7 +866,7 @@ void chanrec::UserList(userrec *user)
        /* if whats left in the list isnt empty, send it */
        if (numusers)
        {
-               user->WriteServ(list);
+               user->WriteServ(std::string(list));
        }
 
        user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name);
@@ -921,20 +921,12 @@ const char* chanrec::GetAllPrefixChars(userrec* user)
        int ctr = 0;
        *prefix = 0;
 
-       /* Cheat and always put the highest first.
-        * This fixes a NASTY ass-umption in xchat.
-        */
-       const char* first = this->GetPrefixChar(user);
-       if (*first)
-               prefix[ctr++] = *first;
-
        prefixlist::iterator n = prefixes.find(user);
        if (n != prefixes.end())
        {
                for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
                {
-                       if (x->first != *first)
-                               prefix[ctr++] = x->first;
+                       prefix[ctr++] = x->first;
                }
        }
 
@@ -1001,6 +993,11 @@ int chanrec::GetStatus(userrec *user)
        return STATUS_NORMAL;
 }
 
+/*bool ModeParser::PrefixComparison(const prefixtype one, const prefixtype two)
+{       
+        return one.second > two.second;
+}*/
+
 void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding)
 {
        prefixlist::iterator n = prefixes.find(user);
@@ -1012,6 +1009,7 @@ void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, b
                        if (std::find(n->second.begin(), n->second.end(), pfx) == n->second.end())
                        {
                                n->second.push_back(pfx);
+                               std::sort(n->second.begin(), n->second.end(), ModeParser::PrefixComparison);
                        }
                }
                else