X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=4c596575997e530b49ef63d013fea4f119149916;hb=34e8e5ff50213baad0ac81df8261a736d96e9b2d;hp=bf2596bb1a2e7574207c8c6505b94c0eb72e7978;hpb=1cbf29e3cd070c12437a657b47fc433008b2c74d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index bf2596bb1..4c5965759 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -16,37 +16,15 @@
 
 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 "message.h"
 #include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "typedefs.h"
 
-extern InspIRCd* ServerInstance;
-
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-
-chanrec::chanrec()
+chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
 {
 	*name = *topic = *setby = *key = 0;
 	created = topicset = limit = 0;
@@ -64,7 +42,7 @@ void chanrec::SetMode(char mode,bool mode_on)
 
 void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
 {
-	log(DEBUG,"SetModeParam called");
+	ServerInstance->Log(DEBUG,"SetModeParam called");
 	
 	CustomModeList::iterator n = custom_mode_params.find(mode);	
 
@@ -73,11 +51,11 @@ void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
 		if (n == custom_mode_params.end())
 		{
 			custom_mode_params[mode] = strdup(parameter);
-			log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
+			ServerInstance->Log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
 		}
 		else
 		{
-			log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second);
+			ServerInstance->Log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second);
 		}
 	}
 	else
@@ -216,7 +194,7 @@ CUList* chanrec::GetVoicedUsers()
  * add a channel to a user, creating the record for it if needed and linking
  * it to the user record 
  */
-chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const char* key)
+chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key)
 {
 	if (!user || !cn)
 		return NULL;
@@ -226,29 +204,29 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 	int MOD_RESULT = 0;
 	strlcpy(cname,cn,CHANMAX);
 
-	chanrec* Ptr = FindChan(cname);
+	chanrec* Ptr = Instance->FindChan(cname);
 
 	if (!Ptr)
 	{
-		if (user->fd > -1)
+		if (IS_LOCAL(user))
 		{
 			MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
+			FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
 			if (MOD_RESULT == 1)
 				return NULL;
 		}
 
 		/* create a new one */
-		Ptr = new chanrec();
-		ServerInstance->chanlist[cname] = Ptr;
+		Ptr = new chanrec(Instance);
+		Instance->chanlist[cname] = Ptr;
 
 		strlcpy(Ptr->name, cname,CHANMAX);
 		Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1;
-		Ptr->created = TIME;
+		Ptr->created = Instance->Time();
 		*Ptr->topic = 0;
-		strlcpy(Ptr->setby, user->nick,NICKMAX-1);
+		*Ptr->setby = 0;
 		Ptr->topicset = 0;
-		log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
+		Instance->Log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
 		/*
 		 * set created to 2 to indicate user
 		 * is the first in the channel
@@ -269,7 +247,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 		if (IS_LOCAL(user)) /* was a check on fd > -1 */
 		{
 			MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname));
+			FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname));
 			if (MOD_RESULT == 1)
 			{
 				return NULL;
@@ -279,31 +257,21 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 				if (*Ptr->key)
 				{
 					MOD_RESULT = 0;
-					FOREACH_RESULT(I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
+					FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
 					if (!MOD_RESULT)
 					{
-						if (!key)
+						if ((!key) || strcmp(key,Ptr->key))
 						{
-							log(DEBUG,"chanrec::JoinUser(): no key given in JOIN");
-							user->WriteServ("475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
+							user->WriteServ("475 %s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
 							return NULL;
 						}
-						else
-						{
-							if (strcmp(key,Ptr->key))
-							{
-								log(DEBUG,"chanrec::JoinUser(): bad key given in JOIN");
-								user->WriteServ("475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
-								return NULL;
-							}
-						}
 					}
 				}
 				if (Ptr->modes[CM_INVITEONLY])
 				{
 					MOD_RESULT = 0;
 					irc::string xname(Ptr->name);
-					FOREACH_RESULT(I_OnCheckInvite,OnCheckInvite(user, Ptr));
+					FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr));
 					if (!MOD_RESULT)
 					{
 						if (user->IsInvited(xname))
@@ -322,10 +290,10 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 				if (Ptr->limit)
 				{
 					MOD_RESULT = 0;
-					FOREACH_RESULT(I_OnCheckLimit,OnCheckLimit(user, Ptr));
+					FOREACH_RESULT_I(Instance,I_OnCheckLimit,OnCheckLimit(user, Ptr));
 					if (!MOD_RESULT)
 					{
-						if (usercount(Ptr) >= Ptr->limit)
+						if (Ptr->GetUserCounter() >= Ptr->limit)
 						{
 							user->WriteServ("471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
 							return NULL;
@@ -335,22 +303,15 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 				if (Ptr->bans.size())
 				{
 					MOD_RESULT = 0;
-					FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, Ptr));
+					FOREACH_RESULT_I(Instance,I_OnCheckBan,OnCheckBan(user, Ptr));
 					char mask[MAXBUF];
 					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;
 						}
 					}
 				}
@@ -358,7 +319,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 		}
 		else
 		{
-			log(DEBUG,"chanrec::JoinUser(): Overridden checks");
+			Instance->Log(DEBUG,"chanrec::JoinUser(): Overridden checks");
 		}
 		created = 1;
 	}
@@ -367,7 +328,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 	{
 		if ((*index)->channel == NULL)
 		{
-			return chanrec::ForceChan(Ptr, *index, user, created);
+			return chanrec::ForceChan(Instance, Ptr, *index, user, created);
 		}
 	}
 
@@ -379,7 +340,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 	if (!IS_LOCAL(user)) /* was a check on fd < 0 */
 	{
 		ucrec* a = new ucrec();
-		chanrec* c = chanrec::ForceChan(Ptr,a,user,created);
+		chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created);
 		user->chans.push_back(a);
 		return c;
 	}
@@ -389,7 +350,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 		if (user->chans.size() < OPERMAXCHANS)
 		{
 			ucrec* a = new ucrec();
-			chanrec* c = chanrec::ForceChan(Ptr,a,user,created);
+			chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created);
 			user->chans.push_back(a);
 			return c;
 		}
@@ -399,14 +360,14 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 
 	if (created == 2)
 	{
-		log(DEBUG,"BLAMMO, Whacking channel.");
+		Instance->Log(DEBUG,"BLAMMO, Whacking channel.");
 		/* Things went seriously pear shaped, so take this away. bwahaha. */
-		chan_hash::iterator n = ServerInstance->chanlist.find(cname);
-		if (n != ServerInstance->chanlist.end())
+		chan_hash::iterator n = Instance->chanlist.find(cname);
+		if (n != Instance->chanlist.end())
 		{
 			Ptr->DelUser(user);
 			DELETE(Ptr);
-			ServerInstance->chanlist.erase(n);
+			Instance->chanlist.erase(n);
 			for (unsigned int index =0; index < user->chans.size(); index++)
 			{
 				if (user->chans[index]->channel == Ptr)
@@ -431,13 +392,14 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
 	return NULL;
 }
 
-chanrec* chanrec::ForceChan(chanrec* Ptr,ucrec *a,userrec* user, int created)
+chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, int created)
 {
 	if (created == 2)
 	{
 		/* first user in is given ops */
 		a->uc_modes = UCMODE_OP;
 		Ptr->AddOppedUser(user);
+		Ptr->SetPrefix(user, '@', OP_VALUE, true);
 	}
 	else
 	{
@@ -446,24 +408,42 @@ chanrec* chanrec::ForceChan(chanrec* Ptr,ucrec *a,userrec* user, int created)
 
 	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 */
 	if (IS_LOCAL(user))
 	{
-		log(DEBUG,"Sent JOIN to client");
 		if (Ptr->topicset)
 		{
 			user->WriteServ("332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
 			user->WriteServ("333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
 		}
-		userlist(user,Ptr);
-		user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
+		Ptr->UserList(user);
 	}
-	FOREACH_MOD(I_OnUserJoin,OnUserJoin(user,Ptr));
+	FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user,Ptr));
 	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
@@ -490,6 +470,8 @@ 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;
 		}
 	}
@@ -500,7 +482,7 @@ long chanrec::PartUser(userrec *user, const char* reason)
 		/* kill the record */
 		if (iter != ServerInstance->chanlist.end())
 		{
-			log(DEBUG,"del_channel: destroyed: %s", this->name);
+			ServerInstance->Log(DEBUG,"del_channel: destroyed: %s", this->name);
 			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
 			ServerInstance->chanlist.erase(iter);
 		}
@@ -536,6 +518,7 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven
 			this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
 			user->chans[i]->uc_modes = 0;
 			user->chans[i]->channel = NULL;
+			this->RemoveAllPrefixes(user);
 			break;
 		}
 	}
@@ -567,14 +550,14 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
 			src->WriteServ("441 %s %s %s :They are not on that channel",src->nick, user->nick, this->name);
 			return this->GetUserCounter();
 		}
-		if ((is_uline(user->server)) && (!is_uline(src->server)))
+		if ((ServerInstance->ULine(user->server)) && (!ServerInstance->ULine(src->server)))
 		{
 			src->WriteServ("482 %s %s :Only a u-line may kick a u-line from a channel.",src->nick, this->name);
 			return this->GetUserCounter();
 		}
 		int MOD_RESULT = 0;
 
-		if (!is_uline(src->server))
+		if (!ServerInstance->ULine(src->server))
 		{
 			MOD_RESULT = 0;
 			FOREACH_RESULT(I_OnUserPreKick,OnUserPreKick(src,user,this,reason));
@@ -585,13 +568,13 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
 		if (MOD_RESULT != -1)
 		{
 			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,this,AC_KICK));
-			if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server)))
+			if ((MOD_RESULT == ACR_DENY) && (!ServerInstance->ULine(src->server)))
 				return this->GetUserCounter();
 	
-			if ((MOD_RESULT == ACR_DEFAULT) || (!is_uline(src->server)))
+			if ((MOD_RESULT == ACR_DEFAULT) || (!ServerInstance->ULine(src->server)))
 			{
-				int them = cstatus(src, this);
-				int us = cstatus(user, this);
+				int them = this->GetStatus(src);
+				int us = this->GetStatus(user);
    			 	if ((them < STATUS_HOP) || (them < us))
 				{
 					if (them == STATUS_HOP)
@@ -618,6 +601,7 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
 			this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
 			(*i)->uc_modes = 0;
 			(*i)->channel = NULL;
+			this->RemoveAllPrefixes(user);
 			break;
 		}
 	}
@@ -663,7 +647,7 @@ void chanrec::WriteChannel(userrec* user, const std::string &text)
 
 	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 	{
-		if (i->second->fd != FD_MAGIC_NUMBER)
+		if (IS_LOCAL(i->second))
 			user->WriteTo(i->second,text);
 	}
 }
@@ -696,28 +680,25 @@ void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text
 
 /* write formatted text from a source user to all users on a channel except
  * for the sender (for privmsg etc) */
-void chanrec::WriteAllExceptSender(userrec* user, char status, char* text, ...)
+void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
 
-	if (!user || !text)
+	if (!text)
 		return;
 
 	va_start(argsPtr, text);
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
 
-	this->WriteAllExceptSender(user, status, std::string(textbuffer));
+	this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
 }
 
-void chanrec::WriteAllExceptSender(userrec* user, char status, const std::string& text)
+void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text)
 {
 	CUList *ulist;
 
-	if (!user)
-		return;
-
 	switch (status)
 	{
 		case '@':
@@ -737,7 +718,314 @@ void chanrec::WriteAllExceptSender(userrec* user, char status, const std::string
 	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 	{
 		if ((IS_LOCAL(i->second)) && (user != i->second))
-			i->second->WriteFrom(user,text);
+		{
+			if (serversource)
+				i->second->WriteServ(text);
+			else
+				i->second->WriteFrom(user,text);
+		}
+	}
+}
+
+/*
+ * return a count of the users on a specific channel accounting for
+ * invisible users who won't increase the count. e.g. for /LIST
+ */
+int chanrec::CountInvisible()
+{
+	int count = 0;
+	CUList *ulist= this->GetUsers();
+	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	{
+		if (!(i->second->modes[UM_INVISIBLE]))
+			count++;
+	}
+
+	return count;
+}
+
+char* chanrec::ChanModes(bool showkey)
+{
+	static char scratch[MAXBUF];
+	static char sparam[MAXBUF];
+	char* offset = scratch;
+	std::string extparam = "";
+
+	*scratch = '\0';
+	*sparam = '\0';
+
+	/* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */
+	for(int n = 0; n < 64; n++)
+	{
+		if(this->modes[n])
+		{
+			*offset++ = n + 65;
+			extparam = "";
+			switch (n)
+			{
+				case CM_KEY:
+					extparam = (showkey ? this->key : "<key>");
+				break;
+				case CM_LIMIT:
+					extparam = ConvToStr(this->limit);
+				break;
+				case CM_NOEXTERNAL:
+				case CM_TOPICLOCK:
+				case CM_INVITEONLY:
+				case CM_MODERATED:
+				case CM_SECRET:
+				case CM_PRIVATE:
+					/* We know these have no parameters */
+				break;
+				default:
+					extparam = this->GetModeParameter(n + 65);
+				break;
+			}
+			if (extparam != "")
+			{
+				charlcat(sparam,' ',MAXBUF);
+				strlcat(sparam,extparam.c_str(),MAXBUF);
+			}
+		}
+	}
+
+	/* Null terminate scratch */
+	*offset = '\0';
+	strlcat(scratch,sparam,MAXBUF);
+	return scratch;
+}
+
+/* compile a userlist of a channel into a string, each nick seperated by
+ * spaces and op, voice etc status shown as @ and +, and send it to 'user'
+ */
+void chanrec::UserList(userrec *user)
+{
+	char list[MAXBUF];
+	size_t dlen, curlen;
+	int MOD_RESULT = 0;
+
+	FOREACH_RESULT(I_OnUserList,OnUserList(user, this));
+	ServerInstance->Log(DEBUG,"MOD_RESULT for UserList = %d",MOD_RESULT);
+	if (MOD_RESULT == 1)
+		return;
+
+	ServerInstance->Log(DEBUG,"Using builtin NAMES list generation");
+
+	dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
+
+	int numusers = 0;
+	char* ptr = list + dlen;
+
+	CUList *ulist= this->GetUsers();
+
+	/* Improvement by Brain - this doesnt change in value, so why was it inside
+	 * the loop?
+	 */
+	bool has_user = this->HasUser(user);
+
+	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	{
+		if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
+		{
+			/*
+			 * user is +i, and source not on the channel, does not show
+			 * nick in NAMES list
+			 */
+			continue;
+		}
+
+		size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick);
+
+		curlen += ptrlen;
+		ptr += ptrlen;
+
+		numusers++;
+
+		if (curlen > (480-NICKMAX))
+		{
+			/* list overflowed into multiple numerics */
+			user->WriteServ(std::string(list));
+
+			/* reset our lengths */
+			dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
+			ptr = list + dlen;
+
+			ptrlen = 0;
+			numusers = 0;
+		}
+	}
+
+	/* if whats left in the list isnt empty, send it */
+	if (numusers)
+	{
+		user->WriteServ(std::string(list));
+	}
+
+	user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name);
+}
+
+long chanrec::GetMaxBans()
+{
+	std::string x;
+	for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
+	{
+		x = n->first;
+		if (match(this->name,x.c_str()))
+		{
+			return n->second;
+		}
+	}
+	return 64;
+}
+
+
+/* returns the status character for a given user on a channel, e.g. @ for op,
+ * % for halfop etc. If the user has several modes set, the highest mode
+ * the user has must be returned.
+ */
+const char* chanrec::GetPrefixChar(userrec *user)
+{
+	static char px[2];
+	unsigned int mx = 0;
+
+	*px = 0;
+	*(px+1) = 0;
+
+	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->second > mx)
+			{
+				*px = x->first;
+				mx  = x->second;
+			}
+		}
+	}
+
+	return px;
+}
+
+const char* chanrec::GetAllPrefixChars(userrec* user)
+{
+	static char prefix[MAXBUF];
+	int ctr = 0;
+	*prefix = 0;
+
+	prefixlist::iterator n = prefixes.find(user);
+	if (n != prefixes.end())
+	{
+		for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
+		{
+			prefix[ctr++] = x->first;
+		}
+	}
+
+	prefix[ctr] = 0;
+
+	return prefix;
+}
+
+unsigned int chanrec::GetPrefixValue(userrec* user)
+{
+	unsigned int mx = 0;
+
+	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->second > mx)
+				mx  = x->second;
+		}
+	}
+
+	return mx;
+}
+
+
+int chanrec::GetStatusFlags(userrec *user)
+{
+	for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
+	{
+		if ((*i)->channel == this)
+		{
+			return (*i)->uc_modes;
+		}
 	}
+	return 0;
+}
+
+
+int chanrec::GetStatus(userrec *user)
+{
+	if (ServerInstance->ULine(user->server))
+		return STATUS_OP;
+
+	for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
+	{
+		if ((*i)->channel == this)
+		{
+			if (((*i)->uc_modes & UCMODE_OP) > 0)
+			{
+				return STATUS_OP;
+			}
+			if (((*i)->uc_modes & UCMODE_HOP) > 0)
+			{
+				return STATUS_HOP;
+			}
+			if (((*i)->uc_modes & UCMODE_VOICE) > 0)
+			{
+				return STATUS_VOICE;
+			}
+			return STATUS_NORMAL;
+		}
+	}
+	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);
+	prefixtype pfx = std::make_pair(prefix,prefix_value);
+	if (adding)
+	{
+		if (n != prefixes.end())
+		{
+			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
+		{
+			pfxcontainer one;
+			one.push_back(pfx);
+			prefixes.insert(std::make_pair<userrec*,pfxcontainer>(user, one));
+		}
+	}
+	else
+	{
+		if (n != prefixes.end())
+		{
+			pfxcontainer::iterator x = std::find(n->second.begin(), n->second.end(), pfx);
+			if (x != n->second.end())
+				n->second.erase(x);
+		}
+	}
+}
+
+void chanrec::RemoveAllPrefixes(userrec* user)
+{
+	prefixlist::iterator n = prefixes.find(user);
+	if (n != prefixes.end())
+		prefixes.erase(n);
 }