X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fopertype.cpp;h=4772e92221fe7d8bb9e0e34089a8839811c7a3f8;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=41d57c58ac6a9de9a2154627944aa2118d0c5b7c;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 41d57c58a..4772e9222 100644
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -29,8 +29,8 @@
 CmdResult CommandOpertype::Handle(const std::vector<std::string>& params, User *u)
 {
 	SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
-	std::string opertype = params[0];
-	if (!IS_OPER(u))
+	const std::string& opertype = params[0];
+	if (!u->IsOper())
 		ServerInstance->Users->all_opers.push_back(u);
 	u->modes[UM_OPERATOR] = 1;
 	OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(" " + opertype);
@@ -42,23 +42,18 @@ CmdResult CommandOpertype::Handle(const std::vector<std::string>& params, User *
 		u->oper->name = opertype;
 	}
 
-	TreeServer* remoteserver = Utils->FindServer(u->server);
-	bool dosend = true;
-
 	if (Utils->quiet_bursts)
 	{
 		/*
 		 * If quiet bursts are enabled, and server is bursting or silent uline (i.e. services),
 		 * then do nothing. -- w00t
 		 */
+		TreeServer* remoteserver = Utils->FindServer(u->server);
 		if (remoteserver->bursting || ServerInstance->SilentULine(u->server))
-		{
-			dosend = false;
-		}
+			return CMD_SUCCESS;
 	}
 
-	if (dosend)
-		ServerInstance->SNO->WriteToSnoMask('O',"From %s: User %s (%s@%s) is now an IRC operator of type %s",u->server.c_str(), u->nick.c_str(),u->ident.c_str(), u->host.c_str(), irc::Spacify(opertype.c_str()));
+	ServerInstance->SNO->WriteToSnoMask('O',"From %s: User %s (%s@%s) is now an IRC operator of type %s",u->server.c_str(), u->nick.c_str(),u->ident.c_str(), u->host.c_str(), irc::Spacify(opertype.c_str()));
 	return CMD_SUCCESS;
 }