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

diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 4772e9222..ab531c171 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::HandleRemote(RemoteUser* u, std::vector<std::string>& params)
 {
-	SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
 	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);
+
+	ServerConfig::OperIndex::const_iterator iter = ServerInstance->Config->OperTypes.find(opertype);
+	if (iter != ServerInstance->Config->OperTypes.end())
 		u->oper = iter->second;
 	else
 	{
@@ -48,12 +50,17 @@ CmdResult CommandOpertype::Handle(const std::vector<std::string>& params, User *
 		 * 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))
+		TreeServer* remoteserver = TreeServer::Get(u);
+		if (remoteserver->IsBehindBursting() || remoteserver->IsSilentULine())
 			return CMD_SUCCESS;
 	}
 
-	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->GetName().c_str(), u->nick.c_str(),u->ident.c_str(), u->host.c_str(), opertype.c_str());
 	return CMD_SUCCESS;
 }
 
+CommandOpertype::Builder::Builder(User* user)
+	: CmdBuilder(user, "OPERTYPE")
+{
+	push_last(user->oper->name);
+}