X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=15f5c0d60aec6e5bfaf892ae6f500df1ceaf980d;hb=5cc9614e73a783dec7a8e0887a0435cf577eaad4;hp=303d292d9a4ef45fe6550ef666ec5c0d43c9c7b4;hpb=c286b42418c3d7614225b1226632a25ac513994b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index 303d292d9..15f5c0d60 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -181,7 +181,10 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ
 			/* Display user's current mode string */
 			user->WriteNumeric(RPL_UMODEIS, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes());
 			if ((targetuser->IsOper()))
-				user->WriteNumeric(RPL_SNOMASKIS, "%s +%s :Server notice mask", targetuser->nick.c_str(), targetuser->FormatNoticeMasks().c_str());
+			{
+				ModeHandler* snomask = FindMode('s', MODETYPE_USER);
+				user->WriteNumeric(RPL_SNOMASKIS, "%s %s :Server notice mask", targetuser->nick.c_str(), snomask->GetUserParameter(user).c_str());
+			}
 			return;
 		}
 		else
@@ -472,7 +475,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
 		else
 			targetuser->WriteFrom(user, "MODE " + LastParse);
 
-		FOREACH_MOD(I_OnMode,OnMode(user, targetuser, targetchannel, LastParseParams, LastParseTranslate));
+		FOREACH_MOD(OnMode, (user, targetuser, targetchannel, LastParseParams, LastParseTranslate));
 	}
 	else if (targetchannel && parameters.size() == 2)
 	{
@@ -890,9 +893,6 @@ ModeParser::ModeParser()
 	/* Clear mode handler list */
 	memset(modehandlers, 0, sizeof(modehandlers));
 
-	/* Last parse string */
-	LastParse.clear();
-
 	seq = 0;
 	memset(&sent, 0, sizeof(sent));
 }