X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fumode_o.cpp;h=1f8d7795018a0e3c78e774faa5e192ee5b28941d;hb=8ab1381e8d277152d99a72f33f3d1c0564060fee;hp=31c5635a9519c453c093f1cf44f87e6aee1fee9a;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp
index 31c5635a9..1f8d77950 100644
--- a/src/modes/umode_o.cpp
+++ b/src/modes/umode_o.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  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.
@@ -17,16 +17,15 @@
 #include "users.h"
 #include "modes/umode_o.h"
 
-ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, 'o', 0, 0, false, MODETYPE_USER, true)
+ModeUserOperator::ModeUserOperator() : ModeHandler(NULL, "oper", 'o', PARAM_NONE, MODETYPE_USER)
 {
+	oper = true;
 }
 
-ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding, bool servermode)
+ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding)
 {
 	/* Only opers can execute this class at all */
-	if (!ServerInstance->ULine(source->nick.c_str()) &&
-		!ServerInstance->ULine(source->server) &&
-		source->oper.empty())
+	if (!ServerInstance->ULine(source->nick.c_str()) && !ServerInstance->ULine(source->server) && !IS_OPER(source))
 		return MODEACTION_DENY;
 
 	/* Not even opers can GIVE the +o mode, only take it away */
@@ -39,10 +38,9 @@ ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, st
 	 * verifying as an oper and getting an opertype assigned
 	 * to your User!
 	 */
-	if (IS_LOCAL(dest))
-		ServerInstance->SNO->WriteToSnoMask('o', "User %s de-opered (by %s)", dest->nick.c_str(), source->nick.c_str());
-	else
-		ServerInstance->SNO->WriteToSnoMask('O', "User %s de-opered (by %s)", dest->nick.c_str(), source->nick.c_str());
+	char snomask = IS_LOCAL(dest) ? 'o' : 'O';
+	ServerInstance->SNO->WriteToSnoMask(snomask, "User %s de-opered (by %s)", dest->nick.c_str(),
+		source->nick.empty() ? source->server.c_str() : source->nick.c_str());
 	dest->UnOper();
 
 	return MODEACTION_ALLOW;