X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=ea5e36d94cb87b32892730da9f276173d6d982d7;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=282c6ea12b740dc364982ea2c4c07f3cf69e106b;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 282c6ea12..ea5e36d94 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -33,7 +33,7 @@ class ModuleOverride : public Module
 		: Module(Me)
 	{
 		// read our config options (main config file)
-		OnRehash(NULL,"");
+		OnRehash(NULL);
 		ServerInstance->SNO->EnableSnomask('G', "GODMODE");
 		if (!ServerInstance->Modules->PublishFeature("Override", this))
 		{
@@ -45,25 +45,23 @@ class ModuleOverride : public Module
 		ServerInstance->Modules->Attach(eventlist, this, 8);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		// on a rehash we delete our classes for good measure and create them again.
-		ConfigReader* Conf = new ConfigReader(ServerInstance);
+		ConfigReader Conf(ServerInstance);
 
 		// re-read our config options on a rehash
-		NoisyOverride = Conf->ReadFlag("override", "noisy", 0);
-		RequireKey = Conf->ReadFlag("override", "requirekey", 0);
+		NoisyOverride = Conf.ReadFlag("override", "noisy", 0);
+		RequireKey = Conf.ReadFlag("override", "requirekey", 0);
 
 		overrides.clear();
 
-		for (int j =0; j < Conf->Enumerate("type"); j++)
+		for (int j =0; j < Conf.Enumerate("type"); j++)
 		{
-			std::string typen = Conf->ReadValue("type","name",j);
-			std::string tokenlist = Conf->ReadValue("type","override",j);
+			std::string typen = Conf.ReadValue("type","name",j);
+			std::string tokenlist = Conf.ReadValue("type","override",j);
 			overrides[typen] = tokenlist;
 		}
-
-		delete Conf;
 	}
 
 
@@ -73,7 +71,7 @@ class ModuleOverride : public Module
 		{
 			if ((irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS) && !ServerInstance->Modes->GetLastParse().empty())
 			{
-				std::string msg = std::string(user->nick)+" Overriding modes: "+ServerInstance->Modes->GetLastParse()+" [Detail: ";
+				std::string msg = std::string(user->nick)+" overriding modes: "+ServerInstance->Modes->GetLastParse()+" [Detail: ";
 				if (OverOps)
 					msg += ConvToStr(OverOps)+" op"+(OverOps != 1 ? "s" : "")+", ";
 				if (OverDeops)
@@ -89,7 +87,7 @@ class ModuleOverride : public Module
 				if (OverOther)
 					msg += "others, ";
 				msg.replace(msg.length()-2, 2, 1, ']');
-				ServerInstance->SNO->WriteToSnoMask('G',msg);
+				ServerInstance->SNO->WriteGlobalSno('G',msg);
 			}
 
 			OverriddenMode = OverOther = false;
@@ -124,7 +122,7 @@ class ModuleOverride : public Module
 		{
 			if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetStatus(source) < STATUS_HOP))
 			{
-				ServerInstance->SNO->WriteToSnoMask('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
+				ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to change a topic on "+std::string(channel->name));
 			}
 
 			// Explicit allow
@@ -141,7 +139,7 @@ class ModuleOverride : public Module
 			// If the kicker's status is less than the target's,			or	the kicker's status is less than or equal to voice
 			if ((chan->GetStatus(source) < chan->GetStatus(user))			|| (chan->GetStatus(source) <= STATUS_VOICE))
 			{
-				ServerInstance->SNO->WriteToSnoMask('G',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
+				ServerInstance->SNO->WriteGlobalSno('G',std::string(source->nick)+" used oper override to kick "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")");
 			}
 			/* Returning -1 explicitly allows the kick */
 			return -1;
@@ -246,12 +244,12 @@ class ModuleOverride : public Module
 						{
 							// Can't join normally -- must use a special key to bypass restrictions
 							user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
-							return 1;
+							return 0;
 						}
 
 						if (NoisyOverride)
 							chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick.c_str());
-						ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
+						ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +i on "+std::string(cname));
 					}
 					return -1;
 				}
@@ -262,12 +260,12 @@ class ModuleOverride : public Module
 					{
 						// Can't join normally -- must use a special key to bypass restrictions
 						user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
-						return 1;
+						return 0;
 					}
 
 					if (NoisyOverride)
 						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick.c_str());
-					ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
+					ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +k on "+std::string(cname));
 					return -1;
 				}
 
@@ -277,12 +275,12 @@ class ModuleOverride : public Module
 					{
 						// Can't join normally -- must use a special key to bypass restrictions
 						user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
-						return 1;
+						return 0;
 					}
 
 					if (NoisyOverride)
 						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick.c_str());
-					ServerInstance->SNO->WriteToSnoMask('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
+					ServerInstance->SNO->WriteGlobalSno('G', user->nick+" used oper override to bypass +l on "+std::string(cname));
 					return -1;
 				}
 
@@ -292,12 +290,12 @@ class ModuleOverride : public Module
 					{
 						// Can't join normally -- must use a special key to bypass restrictions
 						user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
-						return 1;
+						return 0;
 					}
 
 					if (NoisyOverride)
 						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick.c_str());
-					ServerInstance->SNO->WriteToSnoMask('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
+					ServerInstance->SNO->WriteGlobalSno('G',"%s used oper override to bypass channel ban on %s", user->nick.c_str(), cname);
 					return -1;
 				}
 			}