X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fopertype.cpp;h=c3f9b633cf33da570d5b5491781d9794f4acb41e;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=41d57c58ac6a9de9a2154627944aa2118d0c5b7c;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 41d57c58a..c3f9b633c 100644
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -26,15 +26,17 @@
 /** Because the core won't let users or even SERVERS set +o,
  * we use the OPERTYPE command to do this.
  */
-CmdResult CommandOpertype::Handle(const std::vector<std::string>& params, User *u)
+CmdResult CommandOpertype::Handle(User* u, std::vector<std::string>& params)
 {
-	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);
-	if (iter != ServerInstance->Config->oper_blocks.end())
+
+	ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
+	u->SetMode(opermh, true);
+
+	OperIndex::iterator iter = ServerInstance->Config->OperTypes.find(opertype);
+	if (iter != ServerInstance->Config->OperTypes.end())
 		u->oper = iter->second;
 	else
 	{
@@ -42,23 +44,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(), opertype.c_str());
 	return CMD_SUCCESS;
 }