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

diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 807a76d39..4772e9222 100644
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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 "commands.h"
 #include "treeserver.h"
@@ -22,8 +29,8 @@
 CmdResult CommandOpertype::Handle(const std::vector<std::string>& params, User *u)
 {
 	SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
-	std::string opertype = params[0];
-	if (!IS_OPER(u))
+	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);
@@ -35,23 +42,18 @@ CmdResult CommandOpertype::Handle(const std::vector<std::string>& params, User *
 		u->oper->name = opertype;
 	}
 
-	TreeServer* remoteserver = Utils->FindServer(u->server);
-	bool dosend = true;
-
 	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 = Utils->FindServer(u->server);
 		if (remoteserver->bursting || ServerInstance->SilentULine(u->server))
-		{
-			dosend = false;
-		}
+			return CMD_SUCCESS;
 	}
 
-	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()));
+	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;
 }