Fix a crash when the core_oper module is not loaded.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / opertype.cpp

diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 6402b89dca9020878a17c739dcd114046014fe68..99c5ea8bc44bd08ea80f97acc9b60dce97526390 100644 (file)
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -26,24 +26,21 @@
 /** 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, CommandBase::Params& params)
 {
-       SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
        const std::string& opertype = params[0];
        if (!u->IsOper())
                ServerInstance->Users->all_opers.push_back(u);
 
        ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
-       u->SetMode(opermh, true);
+       if (opermh)
+               u->SetMode(opermh, true);
 
-       OperIndex::iterator iter = ServerInstance->Config->OperTypes.find(opertype);
+       ServerConfig::OperIndex::const_iterator iter = ServerInstance->Config->OperTypes.find(opertype);
        if (iter != ServerInstance->Config->OperTypes.end())
                u->oper = iter->second;
        else
-       {
-               u->oper = new OperInfo;
-               u->oper->name = opertype;
-       }
+               u->oper = new OperInfo(opertype);
 
        if (Utils->quiet_bursts)
        {
@@ -51,12 +48,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(), 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->GetRealHost().c_str(), opertype.c_str());
        return CMD_SUCCESS;
 }
 
+CommandOpertype::Builder::Builder(User* user)
+       : CmdBuilder(user, "OPERTYPE")
+{
+       push_last(user->oper->name);
+}