Move lots of spanningtree items to commands

[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 86c637bbfb46715ca58837f09280ae76683fe17f..807a76d39abf09c890fa33c17358e1c1ea7651e1 100644 (file)
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,53 +12,46 @@
  */
 
 #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 "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)
+CmdResult CommandOpertype::Handle(const std::vector<std::string>& params, User *u)
 {
-       if (params.size() != 1)
-               return true;
+       SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
        std::string opertype = params[0];
-       User* u = this->Instance->FindNick(prefix);
-       if (u)
+       if (!IS_OPER(u))
+               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())
+               u->oper = iter->second;
+       else
        {
-               if (!u->IsModeSet('o'))
-                       this->Instance->Users->all_opers.push_back(u);
-               u->modes[UM_OPERATOR] = 1;
-               strlcpy(u->oper,opertype.c_str(),NICKMAX-1);
-               Utils->DoOneToAllButSender(u->nick,"OPERTYPE",params,u->server);
+               u->oper = new OperInfo;
+               u->oper->name = opertype;
+       }
 
-               TreeServer* remoteserver = Utils->FindServer(u->server);
-               bool dosend = true;
+       TreeServer* remoteserver = Utils->FindServer(u->server);
+       bool dosend = true;
 
-               if (this->Utils->quiet_bursts)
+       if (Utils->quiet_bursts)
+       {
+               /*
+                * If quiet bursts are enabled, and server is bursting or silent uline (i.e. services),
+                * then do nothing. -- w00t
+                */
+               if (remoteserver->bursting || ServerInstance->SilentULine(u->server))
                {
-                       /*
-                        * If quiet bursts are enabled, and server is bursting or silent uline (i.e. services),
-                        * then do nothing. -- w00t
-                        */
-                       if (
-                               remoteserver->bursting ||
-                               this->Instance->SilentULine(this->Instance->FindServerNamePtr(u->server))
-                          )
-                       {
-                               dosend = false;
-                       }
+                       dosend = false;
                }
-
-               if (dosend)
-                       this->Instance->SNO->WriteToSnoMask('o',"From %s: User %s (%s@%s) is now an IRC operator of type %s",u->server, u->nick,u->ident,u->host,irc::Spacify(opertype.c_str()));
        }
-       return true;
+
+       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()));
+       return CMD_SUCCESS;
 }