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 c76425fdac786be799baadc5647d4eb0e8a29dd5..99c5ea8bc44bd08ea80f97acc9b60dce97526390 100644 (file)
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -1,65 +1,64 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-#include "xline.h"
-
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
-
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
+#include "inspircd.h"
+#include "commands.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /** Because the core won't let users or even SERVERS set +o,
  * we use the OPERTYPE command to do this.
  */
-bool TreeSocket::OperType(const std::string &prefix, std::deque<std::string> &params, const std::string &up)
+CmdResult CommandOpertype::HandleRemote(RemoteUser* u, CommandBase::Params& params)
 {
-       if (params.size() != 1)
-               return true;
-       std::string opertype = params[0];
-       User* u = this->ServerInstance->FindNick(prefix);
-       if (u)
-       {
-               if (!u->IsModeSet('o'))
-                       this->ServerInstance->Users->all_opers.push_back(u);
-               u->modes[UM_OPERATOR] = 1;
-               u->oper.assign(opertype, 0, 512);
-               Utils->DoOneToAllButSender(u->uuid, "OPERTYPE", params, u->server);
+       const std::string& opertype = params[0];
+       if (!u->IsOper())
+               ServerInstance->Users->all_opers.push_back(u);
 
-               TreeServer* remoteserver = Utils->FindServer(u->server);
-               TreeServer* uplink = Utils->FindServer(up);
-               bool dosend = true;
+       ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER);
+       if (opermh)
+               u->SetMode(opermh, true);
 
-               if (this->Utils->quiet_bursts && uplink)
-               {
-                       /*
-                        * If quiet bursts are enabled, and server is bursting or silent uline (i.e. services),
-                        * then do nothing. -- w00t
-                        */
-                       if (
-                               remoteserver->bursting || uplink->bursting || 
-                               this->ServerInstance->SilentULine(this->ServerInstance->FindServerNamePtr(u->server))
-                          )
-                       {
-                               dosend = false;
-                       }
-               }
+       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(opertype);
 
-               if (dosend)
-                       this->ServerInstance->SNO->WriteToSnoMask('O',"From %s: User %s (%s@%s) is now an IRC operator of type %s",u->server, u->nick.c_str(),u->ident.c_str(), u->host.c_str(), irc::Spacify(opertype.c_str()));
+       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 = TreeServer::Get(u);
+               if (remoteserver->IsBehindBursting() || remoteserver->IsSilentULine())
+                       return CMD_SUCCESS;
        }
-       return true;
+
+       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);
+}