* +------------------------------------+
*
* InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#include "inspircd.h"
#include "xline.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.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> ¶ms, const std::string &up)
+bool TreeSocket::OperType(const std::string &prefix, parameterlist ¶ms)
{
if (params.size() != 1)
return true;
std::string opertype = params[0];
- User* u = this->ServerInstance->FindNick(prefix);
+ User* u = ServerInstance->FindNick(prefix);
if (u)
{
- if (!u->IsModeSet('o'))
- this->ServerInstance->Users->all_opers.push_back(u);
+ if (!IS_OPER(u))
+ ServerInstance->Users->all_opers.push_back(u);
u->modes[UM_OPERATOR] = 1;
- u->oper.assign(opertype, 0, 512);
+ OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(" " + opertype);
+ if (iter != ServerInstance->Config->oper_blocks.end())
+ u->oper = iter->second;
+ else
+ {
+ u->oper = new OperInfo;
+ u->oper->name = opertype;
+ }
Utils->DoOneToAllButSender(u->uuid, "OPERTYPE", params, u->server);
TreeServer* remoteserver = Utils->FindServer(u->server);
- TreeServer* uplink = Utils->FindServer(up);
bool dosend = true;
- if (this->Utils->quiet_bursts && uplink)
+ if (this->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 || uplink->bursting ||
- this->ServerInstance->SilentULine(this->ServerInstance->FindServerNamePtr(u->server))
- )
+ if (remoteserver->bursting || ServerInstance->SilentULine(u->server))
{
dosend = false;
}
}
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()));
+ 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 true;
}