X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=6507c6d26bb2ddadee58d836f40150cba453f155;hb=c80508b28be5947648f59710e6653f793a73bd76;hp=56d1f398f7b1dd230fd57f65b26dd70ec9edcced;hpb=f4d202cdbbcaa9e17c21e3f74d7816f58b2ffc6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index 56d1f398f..6507c6d26 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -113,7 +113,7 @@ ModeAction ModeHandler::OnModeChange(userrec* source, userrec* dest, chanrec* ch
 	return MODEACTION_DENY;
 }
 
-std::pair<bool,std::string> ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
 {
 	if (dest)
 	{
@@ -292,7 +292,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
 			 * (e.g. are they a (half)op?
 			 */
 
-			if (cstatus(user, targetchannel) < STATUS_HOP)
+			if ((IS_LOCAL(user)) && (cstatus(user, targetchannel) < STATUS_HOP))
 			{
 				/* We don't have halfop */
 				log(DEBUG,"The user is not a halfop or above, checking other reasons for being able to set the modes");
@@ -560,6 +560,20 @@ bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
 	return true;
 }
 
+ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt)
+{
+	unsigned char mask = 0;
+	unsigned char pos = 0;
+
+	if ((modeletter < 'A') || (modeletter > 'z'))
+		return NULL;
+
+	mt == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+	pos = (modeletter-65) | mask;
+
+	return modehandlers[pos];
+}
+
 bool ModeParser::AddModeWatcher(ModeWatcher* mw)
 {
 	unsigned char mask = 0;