X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=5b5523dfe4829d5ae1a402f3b8d5af293c8899ea;hb=6b43da7511ca875b64e58b84f72dd89485c0e7fd;hp=e04b850375ad701495eec5e8dc20174c7c5daf50;hpb=f562574cc775ad6d2132e8837d33c6d925592bac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index e04b85037..5b5523dfe 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -54,25 +54,91 @@ extern ServerConfig* Config;
 
 extern time_t TIME;
 
-char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status)
+userrec* ModeParser::SanityChecks(userrec *user,char *dest,chanrec *chan,int status)
 {
 	userrec *d;
-	
 	if ((!user) || (!dest) || (!chan) || (!*dest))
 	{
-		log(DEFAULT,"*** BUG *** GiveOps was given an invalid parameter");
 		return NULL;
 	}
 	d = Find(dest);
 	if (!d)
 	{
-		log(DEFAULT,"the target nickname given to GiveOps couldnt be found");
 		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
 		return NULL;
 	}
-	else
+	return d;
+}
+
+char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
+{
+	for (unsigned int i = 0; i < d->chans.size(); i++)
+	{
+		if ((d->chans[i].channel != NULL) && (chan != NULL))
+		if (d->chans[i].channel == chan)
+		{
+			if (d->chans[i].uc_modes & MASK)
+			{
+				return NULL;
+			}
+			d->chans[i].uc_modes = d->chans[i].uc_modes | MASK;
+			switch (MASK)
+			{
+				case UCMODE_OP:
+					d->chans[i].channel->AddOppedUser(d);
+				break;
+				case UCMODE_HOP:
+					d->chans[i].channel->AddHalfoppedUser(d);
+				break;
+				case UCMODE_VOICE:
+					d->chans[i].channel->AddVoicedUser(d);
+				break;
+			}
+			log(DEBUG,"grant: %s %s",d->chans[i].channel->name,d->nick);
+			return d->nick;
+		}
+	}
+	return NULL;
+}
+
+char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
+{
+	for (unsigned int i = 0; i < d->chans.size(); i++)
+	{
+		if ((d->chans[i].channel != NULL) && (chan != NULL))
+		if (d->chans[i].channel == chan)
+		{
+			if ((d->chans[i].uc_modes & MASK) == 0)
+			{
+				return NULL;
+			}
+			d->chans[i].uc_modes ^= MASK;
+			switch (MASK)
+			{
+				case UCMODE_OP:
+					d->chans[i].channel->DelOppedUser(d);
+				break;
+				case UCMODE_HOP:
+					d->chans[i].channel->DelHalfoppedUser(d);
+				break;
+				case UCMODE_VOICE:
+					d->chans[i].channel->DelVoicedUser(d);
+				break;
+			}
+			log(DEBUG,"revoke: %s %s",d->chans[i].channel->name,d->nick);
+			return d->nick;
+		}
+	}
+	return NULL;
+}
+
+char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status)
+{
+	userrec *d = this->SanityChecks(user,dest,chan,status);
+	
+	if (d)
 	{
-		if (user->server == d->server)
+		if (IS_LOCAL(user))
 		{
 			int MOD_RESULT = 0;
 			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
@@ -81,56 +147,26 @@ char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status)
 				return NULL;
 			if (MOD_RESULT == ACR_DEFAULT)
 			{
-				if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+				if ((status < STATUS_OP) && (!is_uline(user->server)))
 				{
-					log(DEBUG,"%s cant give ops to %s because they nave status %d and needs %d",user->nick,dest,status,STATUS_OP);
 					WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
 					return NULL;
 				}
 			}
 		}
 
-
-		for (unsigned int i = 0; i < d->chans.size(); i++)
-		{
-			if ((d->chans[i].channel != NULL) && (chan != NULL))
-			if (d->chans[i].channel == chan)
-			{
-				if (d->chans[i].uc_modes & UCMODE_OP)
-				{
-					/* mode already set on user, dont allow multiple */
-					return NULL;
-				}
-				d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
-				d->chans[i].channel->AddOppedUser((char*)d);
-				log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick);
-				return d->nick;
-			}
-		}
-		log(DEFAULT,"The target channel given to GiveOps was not in the users mode list");
+		return this->Grant(d,chan,UCMODE_OP);
 	}
 	return NULL;
 }
 
 char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
 {
-	userrec *d;
+	userrec *d = this->SanityChecks(user,dest,chan,status);
 	
-	if ((!user) || (!dest) || (!chan) || (!*dest))
-	{
-		log(DEFAULT,"*** BUG *** GiveHops was given an invalid parameter");
-		return NULL;
-	}
-
-	d = Find(dest);
-	if (!d)
+	if (d)
 	{
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-		return NULL;
-	}
-	else
-	{
-		if (user->server == d->server)
+		if (IS_LOCAL(user))
 		{
 			int MOD_RESULT = 0;
 			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP));
@@ -139,7 +175,7 @@ char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
 				return NULL;
 			if (MOD_RESULT == ACR_DEFAULT)
 			{
-				if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+				if ((status < STATUS_OP) && (!is_uline(user->server)))
 				{
 					WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
 					return NULL;
@@ -147,45 +183,18 @@ char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
 			}
 		}
 
-		for (unsigned int i = 0; i < d->chans.size(); i++)
-		{
-			if ((d->chans[i].channel != NULL) && (chan != NULL))
-			if (d->chans[i].channel == chan)
-			{
-				if (d->chans[i].uc_modes & UCMODE_HOP)
-				{
-					/* mode already set on user, dont allow multiple */
-					return NULL;
-				}
-				d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_HOP;
-				d->chans[i].channel->AddHalfoppedUser((char*)d);
-				log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick);
-				return d->nick;
-			}
-		}
+		return this->Grant(d,chan,UCMODE_HOP);
 	}
 	return NULL;
 }
 
 char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status)
 {
-	userrec *d;
+	userrec *d = this->SanityChecks(user,dest,chan,status);
 	
-	if ((!user) || (!dest) || (!chan) || (!*dest))
-	{
-		log(DEFAULT,"*** BUG *** GiveVoice was given an invalid parameter");
-		return NULL;
-	}
-
-	d = Find(dest);
-	if (!d)
+	if (d)
 	{
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-		return NULL;
-	}
-	else
-	{
-		if (user->server == d->server)
+		if (IS_LOCAL(user))
 		{
 			int MOD_RESULT = 0;
 			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_VOICE));
@@ -194,7 +203,7 @@ char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status)
 				return NULL;
 			if (MOD_RESULT == ACR_DEFAULT)
 			{
-				if ((status < STATUS_HOP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+				if ((status < STATUS_HOP) && (!is_uline(user->server)))
 				{
 					WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
 					return NULL;
@@ -202,46 +211,18 @@ char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status)
 			}
 		}
 
-		for (unsigned int i = 0; i < d->chans.size(); i++)
-		{
-			if ((d->chans[i].channel != NULL) && (chan != NULL))
-			if (d->chans[i].channel == chan)
-			{
-				if (d->chans[i].uc_modes & UCMODE_VOICE)
-				{
-					/* mode already set on user, dont allow multiple */
-					return NULL;
-				}
-				d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_VOICE;
-				d->chans[i].channel->AddVoicedUser((char*)d);
-				log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick);
-				return d->nick;
-			}
-		}
+		return this->Grant(d,chan,UCMODE_VOICE);
 	}
 	return NULL;
 }
 
 char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status)
 {
-	userrec *d;
+	userrec *d = this->SanityChecks(user,dest,chan,status);
 	
-	if ((!user) || (!dest) || (!chan) || (!*dest))
+	if (d)
 	{
-		log(DEFAULT,"*** BUG *** TakeOps was given an invalid parameter");
-		return NULL;
-	}
-
-	d = Find(dest);
-	if (!d)
-	{
-		log(DEBUG,"TakeOps couldnt resolve the target nickname: %s",dest);
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-		return NULL;
-	}
-	else
-	{
-		if (user->server == d->server)
+		if (IS_LOCAL(user))
 		{
 			int MOD_RESULT = 0;
 			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
@@ -250,7 +231,7 @@ char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status)
 				return NULL;
 			if (MOD_RESULT == ACR_DEFAULT)
 			{
-				if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)) && (IS_LOCAL(user)))
+				if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
 				{
 					WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
 					return NULL;
@@ -258,46 +239,18 @@ char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status)
 			}
 		}
 
-		for (unsigned int i = 0; i < d->chans.size(); i++)
-		{
-			if ((d->chans[i].channel != NULL) && (chan != NULL))
-			if (d->chans[i].channel == chan)
-			{
-				if ((d->chans[i].uc_modes & UCMODE_OP) == 0)
-				{
-					/* mode already set on user, dont allow multiple */
-					return NULL;
-				}
-				d->chans[i].uc_modes ^= UCMODE_OP;
-				d->chans[i].channel->DelOppedUser((char*)d);
-				log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick);
-				return d->nick;
-			}
-		}
-		log(DEBUG,"TakeOps couldnt locate the target channel in the target users list");
+		return this->Revoke(d,chan,UCMODE_OP);
 	}
 	return NULL;
 }
 
 char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status)
 {
-	userrec *d;
+	userrec *d = this->SanityChecks(user,dest,chan,status);
 	
-	if ((!user) || (!dest) || (!chan) || (!*dest))
-	{
-		log(DEFAULT,"*** BUG *** TakeHops was given an invalid parameter");
-		return NULL;
-	}
-
-	d = Find(dest);
-	if (!d)
-	{
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-		return NULL;
-	}
-	else
+	if (d)
 	{
-		if (user->server == d->server)
+		if (IS_LOCAL(user))
 		{
 			int MOD_RESULT = 0;
 			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEHALFOP));
@@ -307,7 +260,7 @@ char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status)
 			if (MOD_RESULT == ACR_DEFAULT)
 			{
 				/* Tweak by Brain suggested by w00t, allow a halfop to dehalfop themselves */
-				if ((user != d) && ((status < STATUS_OP) && (!is_uline(user->server))) && (IS_LOCAL(user)))
+				if ((user != d) && ((status < STATUS_OP) && (!is_uline(user->server))))
 				{
 					WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
 					return NULL;
@@ -315,45 +268,18 @@ char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status)
 			}
 		}
 
-		for (unsigned int i = 0; i < d->chans.size(); i++)
-		{
-			if ((d->chans[i].channel != NULL) && (chan != NULL))
-			if (d->chans[i].channel == chan)
-			{
-				if ((d->chans[i].uc_modes & UCMODE_HOP) == 0)
-				{
-					/* mode already set on user, dont allow multiple */
-					return NULL;
-				}
-				d->chans[i].uc_modes ^= UCMODE_HOP;
-				d->chans[i].channel->DelHalfoppedUser((char*)d);
-				log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
-				return d->nick;
-			}
-		}
+		return this->Revoke(d,chan,UCMODE_HOP);
 	}
 	return NULL;
 }
 
 char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
 {
-	userrec *d;
-	
-	if ((!user) || (!dest) || (!chan) || (!*dest))
-	{
-		log(DEFAULT,"*** BUG *** TakeVoice was given an invalid parameter");
-		return NULL;
-	}
+	userrec *d = this->SanityChecks(user,dest,chan,status);
 
-	d = Find(dest);
-	if (!d)
-	{
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-		return NULL;
-	}
-	else
+	if (d)	
 	{
-		if (user->server == d->server)
+		if (IS_LOCAL(user))
 		{
 			int MOD_RESULT = 0;
 			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEVOICE));
@@ -362,7 +288,7 @@ char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
 				return NULL;
 			if (MOD_RESULT == ACR_DEFAULT)
 			{
-				if ((status < STATUS_HOP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+				if ((status < STATUS_HOP) && (!is_uline(user->server)))
 				{
 					WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
 					return NULL;
@@ -370,22 +296,7 @@ char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
 			}
 		}
 
-		for (unsigned int i = 0; i < d->chans.size(); i++)
-		{
-			if ((d->chans[i].channel != NULL) && (chan != NULL))
-			if (d->chans[i].channel == chan)
-			{
-				if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0)
-				{
-					/* mode already set on user, dont allow multiple */
-					return NULL;
-				}
-				d->chans[i].uc_modes ^= UCMODE_VOICE;
-				d->chans[i].channel->DelVoicedUser((char*)d);
-				log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
-				return d->nick;
-			}
-		}
+		return this->Revoke(d,chan,UCMODE_VOICE);
 	}
 	return NULL;
 }
@@ -486,63 +397,65 @@ char* ModeParser::TakeBan(userrec *user,char *dest,chanrec *chan,int status)
 	return NULL;
 }
 
-// tidies up redundant modes, e.g. +nt-nt+i becomes +-+i,
-// a section further down the chain tidies up the +-+- crap.
+
+/** ModeParser::CompressModes()
+ * Tidies up redundant modes,
+ * e.g. +nt-nt+i becomes +-+i
+ * A section further down the chain tidies up the +-+- crap.
+ */
 std::string ModeParser::CompressModes(std::string modes,bool channelmodes)
 {
-	int counts[127];
+	/*
+	 * OK, iterate over the mode string and count how many times a certain mode appears in it.
+	 * Then, erase all instances of any character that appears more than once.
+	 * This only operates on modes with no parameters, you can still +v-v+v-v+v-v to your heart's content.
+	 */
+	
+	/* Do we really need an int here? Can you fit enough modes in a line to overflow a short? */
+	short counts[127];
 	bool active[127];
-	memset(counts,0,sizeof(counts));
-	memset(active,0,sizeof(active));
-	for (unsigned int i = 0; i < modes.length(); i++)
+	memset(counts, 0, sizeof(counts));
+	memset(active, 0, sizeof(active));
+	
+	for(unsigned char* i = (unsigned char*)modes.c_str(); *i; i++)
 	{
-		if ((modes[i] == '+') || (modes[i] == '-'))
+		if((*i == '+') || (*i == '-'))
 			continue;
-		if (channelmodes)
-		{
-			if ((strchr("itnmsp",modes[i])) || ((ModeDefined(modes[i],MT_CHANNEL)) && (ModeDefinedOn(modes[i],MT_CHANNEL)==0) && (ModeDefinedOff(modes[i],MT_CHANNEL)==0)))
-			{
-				log(DEBUG,"Tidy mode %c",modes[i]);
-				counts[(unsigned int)modes[i]]++;
-				active[(unsigned int)modes[i]] = true;
-			}
-		}
-		else
+
+		if(!channelmodes || (channelmodes && (strchr("itnmsp", *i) || (ModeDefined(*i, MT_CHANNEL) && !ModeDefinedOn(*i,MT_CHANNEL) && !ModeDefinedOff(*i,MT_CHANNEL)))))
 		{
-			log(DEBUG,"Tidy mode %c",modes[i]);
-			counts[(unsigned int)modes[i]]++;
-			active[(unsigned int)modes[i]] = true;
+			log(DEBUG,"Tidy mode %c", *i);
+			counts[*i]++;
+			active[*i] = true;
 		}
 	}
-	for (int j = 65; j < 127; j++)
+	
+	for(unsigned char j = 65; j < 127; j++)
 	{
 		if ((counts[j] > 1) && (active[j] == true))
 		{
-			static char v[2];
-			v[0] = (unsigned char)j;
-			v[1] = '\0';
-			std::string mode_str = v;
-			std::string::size_type pos = modes.find(mode_str);
-			if (pos != std::string::npos)
+			std::string::size_type pos;
+
+			while((pos = modes.find(j)) != std::string::npos)
 			{
-				log(DEBUG,"all occurances of mode %c to be deleted...",(unsigned char)j);
-				while (modes.find(mode_str) != std::string::npos)
-					modes.erase(modes.find(mode_str),1);
-				log(DEBUG,"New mode line: %s",modes.c_str());
+				log(DEBUG, "Deleting occurence of mode %c...", j);
+				modes.erase(pos, 1);
+				log(DEBUG,"New mode line: %s", modes.c_str());
 			}
 		}
 	}
+	
 	return modes;
 }
 
 void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
 {
-	if (!parameters) {
-		log(DEFAULT,"*** BUG *** process_modes was given an invalid parameter");
+	if ((!parameters) || (pcnt < 2)) {
 		return;
 	}
 
 	char outlist[MAXBUF];
+	char mlist[MAXBUF];
 	char *outpars[32];
 	int param = 2;
 	int pc = 0;
@@ -551,11 +464,6 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int
 	char* r = NULL;
 	bool k_set = false, l_set = false, previously_set_l = false, previously_unset_l = false, previously_set_k = false, previously_unset_k = false;
 
-	if (pcnt < 2)
-	{
-		return;
-	}
-
 	int MOD_RESULT = 0;
 	
 	if (IS_LOCAL(user))
@@ -565,11 +473,10 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int
 			return;
 	}
 
-	log(DEBUG,"process_modes: start: parameters=%d",pcnt);
+	std::string tidied = this->CompressModes(parameters[1],true);
+	strlcpy(mlist,tidied.c_str(),MAXBUF);
+	char* modelist = mlist;
 
-	char* modelist = parameters[1];         /* mode list, e.g. +oo-o *
-						 * parameters[2] onwards are parameters for
-					 	 * modes that require them :) */
 	*outlist = *modelist;
 	char* outl = outlist+1;
 
@@ -577,17 +484,11 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int
 
 	log(DEBUG,"process_modes: modelist: %s",modelist);
 
-	std::string tidied = this->CompressModes(modelist,true);
-	strlcpy(modelist,tidied.c_str(),MAXBUF);
-
 	int len = tidied.length();
 	while (modelist[len-1] == ' ')
 		modelist[--len] = '\0';
 
-	bool next_cant_be_modifier = false;
-	char* modechar;
-
-	for (modechar = (modelist + 1); *modechar; ptr++, modechar++)
+	for (char* modechar = (modelist + 1); *modechar; ptr++, modechar++)
 	{
 		r = NULL;
 
@@ -597,90 +498,84 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int
 		if (pc > MAXMODES-1)
 			break;
 
-		log(DEBUG,"Mode %c",*modechar);
 
+		
+		switch (*modechar)
 		{
-			switch (*modechar)
-			{
-				case '-':
-					*outl++ = '-';
-					mdir = 0;
-					next_cant_be_modifier = true;
-					
-				break;			
-
-				case '+':
-					*outl++ = '+';
-					mdir = 1;
-					next_cant_be_modifier = true;
-				break;
+			case '-':
+				*outl++ = '-';
+				mdir = 0;
+			break;			
+
+			case '+':
+				*outl++ = '+';
+				mdir = 1;
+			break;
 
-				case 'o':
-					log(DEBUG,"Ops");
-					if ((param >= pcnt)) break;
-					log(DEBUG,"Enough parameters left");
-					r = NULL;
-					if (mdir == 1)
-					{
-						MOD_RESULT = 0;
-						FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], true, 1));
-						if (!MOD_RESULT)
-						{
-							log(DEBUG,"calling GiveOps");
-							r = GiveOps(user,parameters[param++],chan,status);
-						}
-						else param++;
-					}
-					else
+			case 'o':
+				log(DEBUG,"Ops");
+				if ((param >= pcnt)) break;
+				log(DEBUG,"Enough parameters left");
+				r = NULL;
+				if (mdir == 1)
+				{
+					MOD_RESULT = 0;
+					FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], true, 1));
+					if (!MOD_RESULT)
 					{
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1));
-                                                if (!MOD_RESULT)
-                                                {
-							log(DEBUG,"calling TakeOps");
-							r = TakeOps(user,parameters[param++],chan,status);
-						}
-						else param++;
+						r = GiveOps(user,parameters[param++],chan,status);
 					}
-					if (r)
-					{
-						*outl++ = 'o';
-						outpars[pc++] = r;
+					else param++;
+				}
+				else
+				{
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1));
+                                        if (!MOD_RESULT)
+                                        {
+						r = TakeOps(user,parameters[param++],chan,status);
 					}
-				break;
+					else param++;
+				}
+				if (r)
+				{
+					*outl++ = 'o';
+					outpars[pc++] = r;
+				}
+			break;
 			
-				case 'h':
-					if (((param >= pcnt)) || (!Config->AllowHalfop)) break;
-					r = NULL;
-					if (mdir == 1)
-					{
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], true, 1));
-                                                if (!MOD_RESULT)
-                                                {
-							r = GiveHops(user,parameters[param++],chan,status);
-						}
-						else param++;
-					}
-					else
-					{
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1));
-                                                if (!MOD_RESULT)
-                                                {
-							r = TakeHops(user,parameters[param++],chan,status);
-						}
-						else param++;
+			case 'h':
+				if (((param >= pcnt)) || (!Config->AllowHalfop)) break;
+				r = NULL;
+				if (mdir == 1)
+				{
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], true, 1));
+                                        if (!MOD_RESULT)
+                                        {
+						r = GiveHops(user,parameters[param++],chan,status);
 					}
-					if (r)
-					{
-						*outl++ = 'h';
-						outpars[pc++] = r;
+					else param++;
+				}
+				else
+				{
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1));
+                                        if (!MOD_RESULT)
+                                        {
+						r = TakeHops(user,parameters[param++],chan,status);
 					}
-				break;
+					else param++;
+				}
+				if (r)
+				{
+					*outl++ = 'h';
+					outpars[pc++] = r;
+				}
+			break;
 			
 				
-				case 'v':
+			case 'v':
 					if ((param >= pcnt)) break;
 					r = NULL;
 					if (mdir == 1)
@@ -708,383 +603,380 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int
 						*outl++ = 'v';
 						outpars[pc++] = r;
 					}
-				break;
+			break;
 				
-				case 'b':
-					if ((param >= pcnt)) break;
-					r = NULL;
-					if (mdir == 1)
-					{
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], true, 1));
-                                                if (!MOD_RESULT)
-                                                {
-							r = AddBan(user,parameters[param++],chan,status);
-						}
-						else param++;
-					}
-					else
-					{
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1));
-                                                if (!MOD_RESULT)
-                                                {
-							r = TakeBan(user,parameters[param++],chan,status);
-						}
-						else param++;
+			case 'b':
+				if ((param >= pcnt)) break;
+				r = NULL;
+				if (mdir == 1)
+				{
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], true, 1));
+                                        if (!MOD_RESULT)
+                                        {
+						r = AddBan(user,parameters[param++],chan,status);
 					}
-					if (r)
-					{
-						*outl++ = 'b';
-						outpars[pc++] = parameters[param-1];
+					else param++;
+				}
+				else
+				{
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1));
+                                        if (!MOD_RESULT)
+                                        {
+						r = TakeBan(user,parameters[param++],chan,status);
 					}
-				break;
+					else param++;
+				}
+				if (r)
+				{
+					*outl++ = 'b';
+					outpars[pc++] = parameters[param-1];
+				}
+			break;
 
 
-				case 'k':
-					if ((param >= pcnt))
-						break;
+			case 'k':
+				if ((param >= pcnt))
+					break;
 
-					if (mdir == 1)
-					{
-						if (k_set)
-							break;
+				if (mdir == 1)
+				{
+					if (k_set)
+						break;
 
-						if (previously_unset_k)
-							break;
-						previously_set_k = true;
+					if (previously_unset_k)
+						break;
+					previously_set_k = true;
 						
-						if (!*chan->key)
-						{
-							MOD_RESULT = 0;
-							FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1));
-							if (!MOD_RESULT)
-							{
-								*outl++ = 'k';
-								char key[MAXBUF];
-								strlcpy(key,parameters[param++],32);
-								outpars[pc++] = key;
-								strlcpy(chan->key,key,MAXBUF);
-								k_set = true;
-							}
-							else param++;
-						}
-					}
-					else
+					if (!*chan->key)
 					{
-						/* checks on -k are case sensitive and only accurate to the
-  						   first 32 characters */
-						if (previously_set_k)
-							break;
-						previously_unset_k = true;
-
-						char key[MAXBUF];
 						MOD_RESULT = 0;
-						FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], false, 1));
+						FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1));
 						if (!MOD_RESULT)
 						{
+							*outl++ = 'k';
+							char key[MAXBUF];
 							strlcpy(key,parameters[param++],32);
-							/* only allow -k if correct key given */
-							if (!strcmp(chan->key,key))
-							{
-								*outl++ = 'k';
-								*chan->key = 0;
-								outpars[pc++] = key;
-							}
+							outpars[pc++] = key;
+							strlcpy(chan->key,key,MAXBUF);
+							k_set = true;
 						}
 						else param++;
 					}
-				break;
-				
-				case 'l':
-					if (mdir == 0)
+				}
+				else
+				{
+					/* checks on -k are case sensitive and only accurate to the
+ 						   first 32 characters */
+					if (previously_set_k)
+						break;
+					previously_unset_k = true;
+
+					char key[MAXBUF];
+					MOD_RESULT = 0;
+					FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], false, 1));
+					if (!MOD_RESULT)
 					{
-						if (previously_set_l)
-							break;
-						previously_unset_l = true;
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0));
-                                                if (!MOD_RESULT)
-                                                {
-							if (chan->limit)
-							{
-								*outl++ = 'l';
-								chan->limit = 0;
-							}
+						strlcpy(key,parameters[param++],32);
+						/* only allow -k if correct key given */
+						if (!strcmp(chan->key,key))
+						{
+							*outl++ = 'k';
+							*chan->key = 0;
+							outpars[pc++] = key;
 						}
 					}
-					
-					if ((param >= pcnt)) break;
-					if (mdir == 1)
-					{
-						if (l_set)
-							break;
-						if (previously_unset_l)
-							break;
-						previously_set_l = true;
-						bool invalid = false;
-						for (char* f = parameters[param]; *f; f++)
+					else param++;
+				}
+			break;
+				
+			case 'l':
+				if (mdir == 0)
+				{
+					if (previously_set_l)
+						break;
+					previously_unset_l = true;
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0));
+                                        if (!MOD_RESULT)
+                                        {
+						if (chan->limit)
 						{
-							if ((*f < '0') || (*f > '9'))
-							{
-								invalid = true;
-							}
+							*outl++ = 'l';
+							chan->limit = 0;
 						}
-						/* If the limit is < 1, or the new limit is the current limit, dont allow */
-						if ((atoi(parameters[param]) < 1) || ((chan->limit > 0) && (atoi(parameters[param]) == chan->limit)))
+					}
+				}
+					
+				if ((param >= pcnt)) break;
+				if (mdir == 1)
+				{
+					if (l_set)
+						break;
+					if (previously_unset_l)
+						break;
+					previously_set_l = true;
+					bool invalid = false;
+					for (char* f = parameters[param]; *f; f++)
+					{
+						if ((*f < '0') || (*f > '9'))
 						{
 							invalid = true;
 						}
+					}
+					/* If the limit is < 1, or the new limit is the current limit, dont allow */
+					if ((atoi(parameters[param]) < 1) || ((chan->limit > 0) && (atoi(parameters[param]) == chan->limit)))
+					{
+						invalid = true;
+					}
 
-						if (invalid)
-							break;
+					if (invalid)
+						break;
 
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', parameters[param], true, 1));
-                                                if (!MOD_RESULT)
-                                                {
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', parameters[param], true, 1));
+                                        if (!MOD_RESULT)
+                                        {
 	
-							chan->limit = atoi(parameters[param]);
-							
-							// reported by mech: large values cause underflow
-							if (chan->limit < 0)
-								chan->limit = 0x7FFF;
-						}
+						chan->limit = atoi(parameters[param]);
 							
-						if (chan->limit)
-						{
-							*outl++ = 'l';
-							outpars[pc++] = parameters[param++];
-							l_set = true;
-						}
+						// reported by mech: large values cause underflow
+						if (chan->limit < 0)
+							chan->limit = 0x7FFF;
 					}
-				break;
+						
+					if (chan->limit)
+					{
+						*outl++ = 'l';
+						outpars[pc++] = parameters[param++];
+						l_set = true;
+					}
+				}
+			break;
 				
-				case 'i':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0));
-                                        if (!MOD_RESULT)
-                                        {
-						if (mdir)
-						{
-							if (!(chan->binarymodes & CM_INVITEONLY)) *outl++ = 'i';
-							chan->binarymodes |= CM_INVITEONLY;
-						}
-						else
-						{
-							if (chan->binarymodes & CM_INVITEONLY) *outl++ = 'i';
-							chan->binarymodes &= ~CM_INVITEONLY;
-						}
+			case 'i':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+					if (mdir)
+					{
+						if (!(chan->binarymodes & CM_INVITEONLY)) *outl++ = 'i';
+						chan->binarymodes |= CM_INVITEONLY;
 					}
-				break;
+					else
+					{
+						if (chan->binarymodes & CM_INVITEONLY) *outl++ = 'i';
+						chan->binarymodes &= ~CM_INVITEONLY;
+					}
+				}
+			break;
 				
-				case 't':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0));
-                                        if (!MOD_RESULT)
+			case 't':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+					if (mdir)
                                         {
-						if (mdir)
-                                                {
-							if (!(chan->binarymodes & CM_TOPICLOCK)) *outl++ = 't';
-                                                        chan->binarymodes |= CM_TOPICLOCK;
-                                                }
-                                                else
-                                                {
-							if (chan->binarymodes & CM_TOPICLOCK) *outl++ = 't';
-                                                        chan->binarymodes &= ~CM_TOPICLOCK;
-                                                }
-					}
-				break;
+						if (!(chan->binarymodes & CM_TOPICLOCK)) *outl++ = 't';
+                                                chan->binarymodes |= CM_TOPICLOCK;
+                                        }
+                                        else
+                                        {
+						if (chan->binarymodes & CM_TOPICLOCK) *outl++ = 't';
+                                                chan->binarymodes &= ~CM_TOPICLOCK;
+                                        }
+				}
+			break;
 				
-				case 'n':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0));
-                                        if (!MOD_RESULT)
+			case 'n':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+                                        if (mdir)
                                         {
-                                                if (mdir)
-                                                {
-							if (!(chan->binarymodes & CM_NOEXTERNAL)) *outl++ = 'n';
-                                                        chan->binarymodes |= CM_NOEXTERNAL;
-                                                }
-                                                else
-                                                {
-							if (chan->binarymodes & CM_NOEXTERNAL) *outl++ = 'n';
-                                                        chan->binarymodes &= ~CM_NOEXTERNAL;
-                                                }
-					}
-				break;
+						if (!(chan->binarymodes & CM_NOEXTERNAL)) *outl++ = 'n';
+                                                chan->binarymodes |= CM_NOEXTERNAL;
+                                        }
+                                        else
+                                        {
+						if (chan->binarymodes & CM_NOEXTERNAL) *outl++ = 'n';
+                                                chan->binarymodes &= ~CM_NOEXTERNAL;
+                                        }
+				}
+			break;
 				
-				case 'm':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0));
-                                        if (!MOD_RESULT)
+			case 'm':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+                                        if (mdir)
                                         {
-                                                if (mdir)
-                                                {
-                                                        if (!(chan->binarymodes & CM_MODERATED)) *outl++ = 'm';
-                                                        chan->binarymodes |= CM_MODERATED;
-                                                }
-                                                else
-                                                {
-                                                        if (chan->binarymodes & CM_MODERATED) *outl++ = 'm';
-                                                        chan->binarymodes &= ~CM_MODERATED;
-                                                }
-					}
-				break;
+                                                if (!(chan->binarymodes & CM_MODERATED)) *outl++ = 'm';
+                                                chan->binarymodes |= CM_MODERATED;
+                                        }
+                                        else
+                                        {
+                                                if (chan->binarymodes & CM_MODERATED) *outl++ = 'm';
+                                                chan->binarymodes &= ~CM_MODERATED;
+                                        }
+				}
+			break;
 				
-				case 's':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0));
-                                        if (!MOD_RESULT)
+			case 's':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+                                        if (mdir)
                                         {
-                                                if (mdir)
+                                                if (!(chan->binarymodes & CM_SECRET)) *outl++ = 's';
+                                                chan->binarymodes |= CM_SECRET;
+                                                if (chan->binarymodes & CM_PRIVATE)
                                                 {
-                                                        if (!(chan->binarymodes & CM_SECRET)) *outl++ = 's';
-                                                        chan->binarymodes |= CM_SECRET;
-                                                        if (chan->binarymodes & CM_PRIVATE)
+                                                        chan->binarymodes &= ~CM_PRIVATE;
+                                                        if (mdir)
                                                         {
-                                                                chan->binarymodes &= ~CM_PRIVATE;
-                                                                if (mdir)
-                                                                {
-									*outl++ = '-'; *outl++ = 'p'; *outl++ = '+';
-                                                                }
+								*outl++ = '-'; *outl++ = 'p'; *outl++ = '+';
                                                         }
                                                 }
-                                                else
-                                                {
-                                                        if (chan->binarymodes & CM_SECRET) *outl++ = 's';
-                                                        chan->binarymodes &= ~CM_SECRET;
-                                                }
-					}
-				break;
+                                        }
+                                        else
+                                        {
+                                                if (chan->binarymodes & CM_SECRET) *outl++ = 's';
+                                                chan->binarymodes &= ~CM_SECRET;
+                                        }
+				}
+			break;
 				
-				case 'p':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
-                                        if (!MOD_RESULT)
+			case 'p':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+                                        if (mdir)
                                         {
-                                                if (mdir)
+                                                if (!(chan->binarymodes & CM_PRIVATE)) *outl++ = 'p';
+                                                chan->binarymodes |= CM_PRIVATE;
+                                                if (chan->binarymodes & CM_SECRET)
                                                 {
-                                                        if (!(chan->binarymodes & CM_PRIVATE)) *outl++ = 'p';
-                                                        chan->binarymodes |= CM_PRIVATE;
-                                                        if (chan->binarymodes & CM_SECRET)
+                                                        chan->binarymodes &= ~CM_SECRET;
+                                                        if (mdir)
                                                         {
-                                                                chan->binarymodes &= ~CM_SECRET;
-                                                                if (mdir)
-                                                                {
-									*outl++ = '-'; *outl++ = 's'; *outl++ = '+';
-                                                                }
+								*outl++ = '-'; *outl++ = 's'; *outl++ = '+';
                                                         }
                                                 }
-                                                else
-                                                {
-                                                        if (chan->binarymodes & CM_PRIVATE) *outl++ = 'p';
-                                                        chan->binarymodes &= ~CM_PRIVATE;
-                                                }
-					}
-				break;
+                                        }
+                                        else
+                                        {
+                                                if (chan->binarymodes & CM_PRIVATE) *outl++ = 'p';
+                                                chan->binarymodes &= ~CM_PRIVATE;
+                                        }
+				}
+			break;
 				
-				default:
-					log(DEBUG,"Preprocessing custom mode %c: modelist: %s",*modechar,chan->custom_modes);
-					string_list p;
-					p.clear();
-					if (((!strchr(chan->custom_modes,*modechar)) && (!mdir)) || ((strchr(chan->custom_modes,*modechar)) && (mdir)))
+			default:
+				string_list p;
+				p.clear();
+				bool x = chan->custom_modes[*modechar-65];
+				if ((!x && !mdir) || (x && mdir))
+				{
+					if (!ModeIsListMode(*modechar,MT_CHANNEL))
+					{
+						log(DEBUG,"Mode %c isnt set on %s but trying to remove!",*modechar,chan->name);
+						break;
+					}
+				}
+				if (ModeDefined(*modechar,MT_CHANNEL))
+				{
+					/* A module has claimed this mode */
+					if (param<pcnt)
 					{
-						if (!ModeIsListMode(*modechar,MT_CHANNEL))
+     						if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
+						{
+							p.push_back(parameters[param]);
+						}
+						if ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir))
 						{
-							log(DEBUG,"Mode %c isnt set on %s but trying to remove!",*modechar,chan->name);
-							break;
+							p.push_back(parameters[param]);
 						}
 					}
-					if (ModeDefined(*modechar,MT_CHANNEL))
+					bool handled = false;
+					if (param>=pcnt)
 					{
-						log(DEBUG,"A module has claimed this mode");
-						if (param<pcnt)
+						// we're supposed to have a parameter, but none was given... so dont handle the mode.
+						if (((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir)))	
 						{
-     							if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
-							{
-      								p.push_back(parameters[param]);
-  							}
-							if ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir))
-							{
-      								p.push_back(parameters[param]);
-  							}
-  						}
-  						bool handled = false;
-  						if (param>=pcnt)
-  						{
-  							// we're supposed to have a parameter, but none was given... so dont handle the mode.
-  							if (((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir)))	
-  							{
-  								log(DEBUG,"Not enough parameters for module-mode %c",*modechar);
-  								handled = true;
-  								param++;
-  							}
-  						}
-
-						// BIG ASS IDIOTIC CODER WARNING!
-						// Using OnRawMode on another modules mode's behavour 
-						// will confuse the crap out of admins! just because you CAN
-						// do it, doesnt mean you SHOULD!
-	                                        MOD_RESULT = 0;
-						std::string para = "";
-						if (p.size())
-							para = p[0];
-        	                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *modechar, para, mdir, pcnt));
-                	                        if (!MOD_RESULT)
-                        	                {
-  							for (int i = 0; i <= MODCOUNT; i++)
+							log(DEBUG,"Not enough parameters for module-mode %c",*modechar);
+							handled = true;
+							param++;
+						}
+					}
+					// BIG ASS IDIOTIC CODER WARNING!
+					// Using OnRawMode on another modules mode's behavour 
+					// will confuse the crap out of admins! just because you CAN
+					// do it, doesnt mean you SHOULD!
+                                        MOD_RESULT = 0;
+					std::string para = "";
+					if (p.size())
+						para = p[0];
+       	                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *modechar, para, mdir, pcnt));
+               	                        if (!MOD_RESULT)
+                       	                {
+ 							for (int i = 0; i <= MODCOUNT; i++)
+						{
+							if (!handled)
 							{
-								if (!handled)
+								int t = modules[i]->OnExtendedMode(user,chan,*modechar,MT_CHANNEL,mdir,p);
+								if (t != 0)
 								{
-									int t = modules[i]->OnExtendedMode(user,chan,*modechar,MT_CHANNEL,mdir,p);
-									if (t != 0)
+									log(DEBUG,"OnExtendedMode returned nonzero for a module");
+									if (ModeIsListMode(*modechar,MT_CHANNEL))
 									{
-										log(DEBUG,"OnExtendedMode returned nonzero for a module");
-										if (ModeIsListMode(*modechar,MT_CHANNEL))
+										if (t == -1)
 										{
-											if (t == -1)
-											{
-												//pc++;
-												param++;
-											}
-											else
-											{
-												if (param < pcnt)
-												{
-													*outl++ = *modechar;
-												}
-												outpars[pc++] = parameters[param++];
-											}
+											//pc++;
+											param++;
 										}
 										else
 										{
 											if (param < pcnt)
 											{
 												*outl++ = *modechar;
-												chan->SetCustomMode(*modechar,mdir);
-												// include parameters in output if mode has them
-												if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
-												{
-													chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir);
-													outpars[pc++] = parameters[param++];
-												}
+											}
+											outpars[pc++] = parameters[param++];
+										}
+									}
+									else
+									{
+										*outl++ = *modechar;
+										chan->SetCustomMode(*modechar,mdir);
+										// include parameters in output if mode has them
+										if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
+										{
+											if (param < pcnt)
+											{
+												chan->SetCustomModeParam(*modechar,parameters[param],mdir);
+												outpars[pc++] = parameters[param++];
 											}
 										}
-										// break, because only one module can handle the mode.
-										handled = true;
 									}
+									// break, because only one module can handle the mode.
+									handled = true;
 								}
 							}
 						}
 					}
-					else
-					{
-						WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,*modechar);
-					}
-				break;
-				
-			}
+				}
+				else
+				{
+					WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,*modechar);
+				}
+			break;
 		}
 	}
 
@@ -1148,6 +1040,7 @@ void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int
 
 bool ModeParser::AllowedUmode(char umode, char* sourcemodes,bool adding,bool serveroverride)
 {
+	bool sourceoper = (strchr(sourcemodes,'o') != NULL);
 	log(DEBUG,"Allowed_umode: %c %s",umode,sourcemodes);
 	// Servers can +o and -o arbitrarily
 	if ((serveroverride == true) && (umode == 'o'))
@@ -1157,34 +1050,32 @@ bool ModeParser::AllowedUmode(char umode, char* sourcemodes,bool adding,bool ser
 	// RFC1459 specified modes
 	if ((umode == 'w') || (umode == 's') || (umode == 'i'))
 	{
-		log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
+		/* umode allowed by RFC1459 scemantics */
 		return true;
 	}
 	
-	// user may not +o themselves or others, but an oper may de-oper other opers or themselves
-	if ((strchr(sourcemodes,'o')) && (!adding))
+	/* user may not +o themselves or others, but an oper may de-oper other opers or themselves */
+	if (sourceoper && !adding)
 	{
-		log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
 		return true;
 	}
 	else if (umode == 'o')
 	{
-		log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
+		/* Bad oper, bad bad! */
 		return false;
 	}
 	
-	// process any module-defined modes that need oper
-	if ((ModeDefinedOper(umode,MT_CLIENT)) && (strchr(sourcemodes,'o')))
+	/* process any module-defined modes that need oper */
+	if ((ModeDefinedOper(umode,MT_CLIENT)) && (sourceoper))
 	{
 		log(DEBUG,"umode %c allowed by module handler (oper only mode)",umode);
 		return true;
 	}
-	else
-	if (ModeDefined(umode,MT_CLIENT))
+	else if (ModeDefined(umode,MT_CLIENT))
 	{
 		// process any module-defined modes that don't need oper
 		log(DEBUG,"umode %c allowed by module handler (non-oper mode)",umode);
-		if ((ModeDefinedOper(umode,MT_CLIENT)) && (!strchr(sourcemodes,'o')))
+		if ((ModeDefinedOper(umode,MT_CLIENT)) && (!sourceoper))
 		{
 			// no, this mode needs oper, and this user 'aint got what it takes!
 			return false;
@@ -1245,26 +1136,21 @@ bool ModeParser::ProcessModuleUmode(char umode, userrec* source, void* dest, boo
 void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
 {
 	chanrec* Ptr;
-	userrec* dest;
+	userrec* dest = Find(parameters[0]);
 	int can_change;
 	int direction = 1;
 	char outpars[MAXBUF];
 	bool next_ok = true;
 
-	dest = Find(parameters[0]);
-
 	if (!user)
-	{
 		return;
-	}
 
 	if ((dest) && (pcnt == 1))
 	{
 		WriteServ(user->fd,"221 %s :+%s",dest->nick,dest->modes);
 		return;
 	}
-
-	if ((dest) && (pcnt > 1))
+	else if ((dest) && (pcnt > 1))
 	{
 		std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
 		parameters[1] = (char*)tidied.c_str();
@@ -1276,7 +1162,7 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
 		can_change = 0;
 		if (user != dest)
 		{
-			if ((strchr(user->modes,'o')) || (is_uline(user->server)))
+			if ((*user->oper) || (is_uline(user->server)))
 			{
 				can_change = 1;
 			}
@@ -1300,79 +1186,80 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
 
 		for (char* i = parameters[1]; *i; i++)
 		{
-			if (*i == ' ')
-				continue;
-
 			if ((i != parameters[1]) && (*i != '+') && (*i != '-'))
 				next_ok = true;
 
-			if (*i == '+')
-			{
-				if ((direction != 1) && (next_ok))
-				{
-					charlcat(outpars,'+',MAXBUF);
-					next_ok = false;
-				}	
-				direction = 1;
-			}
-			else
-			if (*i == '-')
-			{
-				if ((direction != 0) && (next_ok))
-				{
-					charlcat(outpars,'-',MAXBUF);
-					next_ok = false;
-				}
-				direction = 0;
-			}
-			else
+			switch (*i)
 			{
-				can_change = 0;
-				if (strchr(user->modes,'o'))
-				{
-					can_change = 1;
-				}
-				else
-				{
-					if ((*i == 'i') || (*i == 'w') || (*i == 's') || (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,direction,false)))
+				case ' ':
+				continue;
+
+				case '+':
+					if ((direction != 1) && (next_ok))
+					{
+						charlcat(outpars,'+',MAXBUF);
+						next_ok = false;
+					}	
+					direction = 1;
+				break;
+
+				case '-':
+					if ((direction != 0) && (next_ok))
+					{
+						charlcat(outpars,'-',MAXBUF);
+						next_ok = false;
+					}
+					direction = 0;
+				break;
+
+				default:
+					can_change = 0;
+					if (*user->oper)
 					{
 						can_change = 1;
 					}
-				}
-				if (can_change)
-				{
-					if (direction == 1)
+					else
+					{
+						if ((*i == 'i') || (*i == 'w') || (*i == 's') || (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,direction,false)))
+						{
+							can_change = 1;
+						}
+					}
+					if (can_change)
 					{
-						if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,false)))
+						if (direction == 1)
 						{
-							if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
+							if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,false)))
 							{
-								charlcat(dmodes,*i,MAXMODES);
-								charlcat(outpars,*i,MAXMODES);
-								if (*i == 'o')
+								if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
 								{
-									FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
+									charlcat(dmodes,*i,53);
+									charlcat(outpars,*i,MAXMODES);
+									if (*i == 'o')
+									{
+										FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
+									}
 								}
 							}
 						}
-					}
-					else
-					{
-						if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,false)) && (strchr(dmodes,*i)))
+						else
 						{
-							if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
+							if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,false)) && (strchr(dmodes,*i)))
 							{
-								charlcat(outpars,*i,MAXMODES);
-								charremove(dmodes,*i);
-								if (*i == 'o')
+								if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
 								{
-									*dest->oper = 0;
-									DeleteOper(dest);
+									charlcat(outpars,*i,MAXMODES);
+									charremove(dmodes,*i);
+									if (*i == 'o')
+									{
+										*dest->oper = 0;
+										DeleteOper(dest);
+									}
 								}
 							}
 						}
 					}
-				}
+				break;
 			}
 		}
 		if (*outpars)
@@ -1415,75 +1302,75 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
 
 		return;
 	}
-	
-	Ptr = FindChan(parameters[0]);
-	if (Ptr)
+	else
 	{
-		if (pcnt == 1)
-		{
-			/* just /modes #channel */
-			WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr,has_channel(user,Ptr)));
-                        WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
-			return;
-		}
-		else
-		if (pcnt == 2)
+		Ptr = FindChan(parameters[0]);
+		if (Ptr)
 		{
-			char* mode = parameters[1];
-			if (*mode == '+')
-				mode++;
-			int MOD_RESULT = 0;
-                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, Ptr, *mode, "", false, 0));
-                        if (!MOD_RESULT)
-                        {
-				if (*mode == 'b')
-				{
-
-					for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+			if (pcnt == 1)
+			{
+				/* just /modes #channel */
+				WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr,Ptr->HasUser(user)));
+	                        WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
+				return;
+			}
+			else if (pcnt == 2)
+			{
+				char* mode = parameters[1];
+				if (*mode == '+')
+					mode++;
+				int MOD_RESULT = 0;
+	                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, Ptr, *mode, "", false, 0));
+	                        if (!MOD_RESULT)
+	                        {
+					if (*mode == 'b')
 					{
-						WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
+						for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+						{
+							WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
+						}
+						WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name);
+						return;
+					}
+					if ((ModeDefined(*mode,MT_CHANNEL)) && (ModeIsListMode(*mode,MT_CHANNEL)))
+					{
+						// list of items for an extmode
+						log(DEBUG,"Calling OnSendList for all modules, list output for mode %c",*mode);
+						FOREACH_MOD(I_OnSendList,OnSendList(user,Ptr,*mode));
+						return;
 					}
-					WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name);
-					return;
-				}
-				if ((ModeDefined(*mode,MT_CHANNEL)) && (ModeIsListMode(*mode,MT_CHANNEL)))
-				{
-					// list of items for an extmode
-					log(DEBUG,"Calling OnSendList for all modules, list output for mode %c",*mode);
-					FOREACH_MOD(I_OnSendList,OnSendList(user,Ptr,*mode));
-					return;
 				}
 			}
-		}
-
-                if (((Ptr) && (!has_channel(user,Ptr))) && (!is_uline(user->server)) && (IS_LOCAL(user)))
-                {
-                        WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
-                        return;
-                }
 
-		if (Ptr)
-		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
-			
-			if (MOD_RESULT == ACR_DENY)
-				return;
-			if (MOD_RESULT == ACR_DEFAULT)
+			if ((IS_LOCAL(user)) && (!is_uline(user->server)) && (!Ptr->HasUser(user)))
+	                {
+	                        WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
+	                        return;
+	                }
+	
+			if (Ptr)
 			{
-				if ((cstatus(user,Ptr) < STATUS_HOP) && (IS_LOCAL(user)))
-				{
-					WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, Ptr->name);
+				int MOD_RESULT = 0;
+				FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
+				
+				if (MOD_RESULT == ACR_DENY)
 					return;
+				if (MOD_RESULT == ACR_DEFAULT)
+				{
+					if ((IS_LOCAL(user)) && (cstatus(user,Ptr) < STATUS_HOP))
+					{
+						WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, Ptr->name);
+						return;
+					}
 				}
+	
+				ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
 			}
-
-			ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
 		}
-	}
-	else
-	{
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+		else
+		{
+			WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+		}
 	}
 }
 
@@ -1493,20 +1380,12 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
 void ModeParser::ServerMode(char **parameters, int pcnt, userrec *user)
 {
 	chanrec* Ptr;
-	userrec* dest;
+	userrec* dest = Find(parameters[0]);
 	int can_change;
 	int direction = 1;
 	char outpars[MAXBUF];
 	bool next_ok = true;
 
-	dest = Find(parameters[0]);
-	
-	// fix: ChroNiCk found this - we cant use this as debug if its null!
-	if (dest)
-	{
-		log(DEBUG,"server_mode on %s",dest->nick);
-	}
-
 	if ((dest) && (pcnt > 1))
 	{
                 std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
@@ -1524,65 +1403,66 @@ void ModeParser::ServerMode(char **parameters, int pcnt, userrec *user)
 
 		for (char* i = parameters[1]; *i; i++)
 		{
-                        if (*i == ' ')
-                                continue;
-
 			if ((i != parameters[1]) && (*i != '+') && (*i != '-'))
 				next_ok = true;
 
-			if (*i == '+')
-			{
-				if ((direction != 1) && (next_ok))
-				{
-					next_ok = false;
-					charlcat(outpars,'+',MAXBUF);
-				}
-				direction = 1;
-			}
-			else
-			if (*i == '-')
-			{
-				if ((direction != 0) && (next_ok))
-				{
-					next_ok = false;
-					charlcat(outpars,'-',MAXBUF);
-				}
-				direction = 0;
-			}
-			else
+			switch (*i)
 			{
-				log(DEBUG,"begin mode processing entry");
-				can_change = 1;
-				if (can_change)
-				{
-					if (direction == 1)
+                        	case ' ':
+                                continue;
+
+				case '+':
+					if ((direction != 1) && (next_ok))
+					{
+						next_ok = false;
+						charlcat(outpars,'+',MAXBUF);
+					}
+					direction = 1;
+				break;
+
+				case '-':
+					if ((direction != 0) && (next_ok))
 					{
-						log(DEBUG,"umode %c being added",*i);
-						if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,true)))
+						next_ok = false;
+						charlcat(outpars,'-',MAXBUF);
+					}
+					direction = 0;
+				break;
+
+				default:
+					log(DEBUG,"begin mode processing entry");
+					can_change = 1;
+					if (can_change)
+					{
+						if (direction == 1)
 						{
-							log(DEBUG,"umode %c is an allowed umode",*i);
-							if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
+							log(DEBUG,"umode %c being added",*i);
+							if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,true)))
 							{
-								charlcat(dmodes,*i,MAXMODES);
-								charlcat(outpars,*i,MAXMODES);
+								log(DEBUG,"umode %c is an allowed umode",*i);
+								if ((*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o') || (ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)))
+								{
+									charlcat(dmodes,*i,MAXBUF);
+									charlcat(outpars,*i,53);
+								}
 							}
 						}
-					}
-					else
-					{
-						// can only remove a mode they already have
-						log(DEBUG,"umode %c being removed",*i);
-						if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,true)) && (strchr(dmodes,*i)))
+						else
 						{
-							log(DEBUG,"umode %c is an allowed umode",*i);
-							if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
+							// can only remove a mode they already have
+							log(DEBUG,"umode %c being removed",*i);
+							if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,true)) && (strchr(dmodes,*i)))
 							{
-								charlcat(outpars,*i,MAXMODES);
-								charremove(dmodes,*i);
+								log(DEBUG,"umode %c is an allowed umode",*i);
+								if ((*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o') || (ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)))
+								{
+									charlcat(outpars,*i,MAXBUF);
+									charremove(dmodes,*i);
+								}
 							}
 						}
 					}
-				}
+				break;
 			}
 		}
                 if (*outpars)