Fix for parameters which contain a colon (which is not the first char in the string)

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 780251f5f9c34bcb756a5275ffde9f48bc757d01..f340e12bf1528b4edf9a75cc3ddb8aeff0e72129 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)
 {
@@ -921,20 +907,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 +979,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 +995,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