X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=89ff37fa1e7fd0b709bd411c220abdf15cf6b1f4;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=845b23fb0614a395223cd59262a5bbbeb69d3e4d;hpb=6e2b6aae53f007df51a4ded1058d2bc790a3892d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index 845b23fb0..89ff37fa1 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -24,22 +24,18 @@
 
 
 #include "inspircd.h"
-#include "inspstring.h"
 
 /* +s (secret) */
-#include "modes/cmode_s.h"
 /* +p (private) */
-#include "modes/cmode_p.h"
-/* +b (bans) */
-#include "modes/cmode_b.h"
 /* +m (moderated) */
-#include "modes/cmode_m.h"
 /* +t (only (half) ops can change topic) */
-#include "modes/cmode_t.h"
 /* +n (no external messages) */
-#include "modes/cmode_n.h"
 /* +i (invite only) */
-#include "modes/cmode_i.h"
+/* +w (see wallops) */
+/* +i (invisible) */
+#include "modes/simplemodes.h"
+/* +b (bans) */
+#include "modes/cmode_b.h"
 /* +k (keyed channel) */
 #include "modes/cmode_k.h"
 /* +l (channel user limit) */
@@ -48,10 +44,6 @@
 #include "modes/cmode_o.h"
 /* +v (channel voice) */
 #include "modes/cmode_v.h"
-/* +w (see wallops) */
-#include "modes/umode_w.h"
-/* +i (invisible) */
-#include "modes/umode_i.h"
 /* +o (operator) */
 #include "modes/umode_o.h"
 /* +s (server notice masks) */
@@ -354,10 +346,19 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
 		return MODEACTION_DENY;
 	}
 
-	if (mh->GetTranslateType() == TR_NICK && !ServerInstance->FindNick(parameter))
+	if (mh->GetTranslateType() == TR_NICK)
 	{
-		user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameter.c_str());
-		return MODEACTION_DENY;
+		User* prefixtarget;
+		if (IS_LOCAL(user))
+			prefixtarget = ServerInstance->FindNickOnly(parameter);
+		else
+			prefixtarget = ServerInstance->FindNick(parameter);
+
+		if (!prefixtarget)
+		{
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameter.c_str());
+			return MODEACTION_DENY;
+		}
 	}
 
 	if (mh->GetPrefixRank() && chan)
@@ -386,16 +387,23 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
 
 void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool merge)
 {
-	std::string target = parameters[0];
+	const std::string& target = parameters[0];
 	Channel* targetchannel = ServerInstance->FindChan(target);
-	User* targetuser  = ServerInstance->FindNick(target);
+	User* targetuser = NULL;
+	if (!targetchannel)
+	{
+		if (IS_LOCAL(user))
+			targetuser = ServerInstance->FindNickOnly(target);
+		else
+			targetuser = ServerInstance->FindNick(target);
+	}
 	ModeType type = targetchannel ? MODETYPE_CHANNEL : MODETYPE_USER;
 
 	LastParse.clear();
 	LastParseParams.clear();
 	LastParseTranslate.clear();
 
-	if (!targetchannel && !targetuser)
+	if ((!targetchannel) && ((!targetuser) || (IS_SERVER(targetuser))))
 	{
 		user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(),target.c_str());
 		return;
@@ -450,7 +458,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 			continue;
 		}
 
-		std::string parameter = "";
+		std::string parameter;
 		int pcnt = mh->GetNumParams(adding);
 		if (pcnt && param_at == parameters.size())
 		{
@@ -462,7 +470,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 		{
 			parameter = parameters[param_at++];
 			/* Make sure the user isn't trying to slip in an invalid parameter */
-			if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
+			if ((parameter.empty()) || (parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
 				continue;
 			if (merge && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode())
 			{
@@ -683,15 +691,20 @@ bool ModeParser::DelMode(ModeHandler* mh)
 	switch (mh->GetModeType())
 	{
 		case MODETYPE_USER:
-			for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++)
+			for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); )
 			{
-				mh->RemoveMode(i->second);
+				User* user = i->second;
+				++i;
+				mh->RemoveMode(user);
 			}
 		break;
 		case MODETYPE_CHANNEL:
-			for (chan_hash::iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
+			for (chan_hash::iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); )
 			{
-				mh->RemoveMode(i->second);
+				// The channel may not be in the hash after RemoveMode(), see m_permchannels
+				Channel* chan = i->second;
+				++i;
+				mh->RemoveMode(chan);
 			}
 		break;
 	}
@@ -883,7 +896,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
 	mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
 	pos = (mw->GetModeChar()-65) | mask;
 
-	ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw);
+	ModeWatchIter a = std::find(modewatchers[pos].begin(),modewatchers[pos].end(),mw);
 
 	if (a == modewatchers[pos].end())
 	{