X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ojoin.cpp;h=b0c206ab312731dc8d5d724da81f51dfb0e069ec;hb=9962840222b6886f7653fc64443f19ebd661cc63;hp=2c039886208960c6f213c0aaff405ec9bc7d98cd;hpb=c25a59d9036444872d831a126c6326f3d8be5e74;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 2c0398862..b0c206ab3 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -1,6 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2009 Taros <taros34@hotmail.com>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -16,39 +17,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-/*
- * Written for InspIRCd-1.2 by Taros on the Tel'Laerad M&D Team
- * <http://tellaerad.net>
- */
-
 #include "inspircd.h"
 
-/* $ModConfig: <ojoin prefix="!" notice="yes" op="yes">
- *  Specify the prefix that +Y will grant here, it should be unused.
- *  Leave prefix empty if you do not wish +Y to grant a prefix
- *  If notice is set to on, upon ojoin, the server will notice
- *  the channel saying that the oper is joining on network business
- *  If op is set to on, it will give them +o along with +Y */
-/* $ModDesc: Provides the /ojoin command, which joins a user to a channel on network business, and gives them +Y, which makes them immune to kick / deop and so on. */
-/* $ModAuthor: Taros */
-/* $ModAuthorMail: taros34@hotmail.com */
-
-/* A note: This will not protect against kicks from services,
- * ulines, or operoverride. */
-
 #define NETWORK_VALUE 9000000
 
-char NPrefix;
-bool notice;
-bool op;
-
 /** Handle /OJOIN
  */
 class CommandOjoin : public SplitCommand
 {
  public:
 	bool active;
+	bool notice;
+	bool op;
+	ModeHandler* npmh;
 	CommandOjoin(Module* parent) :
 		SplitCommand(parent, "OJOIN", 1)
 	{
@@ -88,10 +69,13 @@ class CommandOjoin : public SplitCommand
 			// they're already in the channel
 			std::vector<std::string> modes;
 			modes.push_back(parameters[0]);
-			modes.push_back(op ? "+Yo" : "+Y");
-			modes.push_back(user->nick);
+			modes.push_back(std::string("+") + npmh->GetModeChar());
 			if (op)
+			{
+				modes[1].push_back('o');
 				modes.push_back(user->nick);
+			}
+			modes.push_back(user->nick);
 			ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
 		}
 		return CMD_SUCCESS;
@@ -103,7 +87,8 @@ class CommandOjoin : public SplitCommand
 class NetworkPrefix : public ModeHandler
 {
  public:
-	NetworkPrefix(Module* parent) : ModeHandler(parent, "official-join", 'Y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+	NetworkPrefix(Module* parent, char NPrefix)
+		: ModeHandler(parent, "official-join", 'Y', PARAM_ALWAYS, MODETYPE_CHANNEL)
 	{
 		list = true;
 		prefix = NPrefix;
@@ -146,22 +131,25 @@ class ModuleOjoin : public Module
 		/* Load config stuff */
 		OnRehash(NULL);
 
+		std::string npre = ServerInstance->Config->ConfValue("ojoin")->getString("prefix");
+		char NPrefix = npre.empty() ? 0 : npre[0];
+		if (NPrefix && ServerInstance->Modes->FindPrefix(NPrefix))
+			throw ModuleException("Looks like the prefix you picked for m_ojoin is already in use. Pick another.");
+
 		/* Initialise module variables */
-		np = new NetworkPrefix(this);
+		np = new NetworkPrefix(this, NPrefix);
+		mycommand.npmh = np;
 
 		ServerInstance->Modules->AddService(*np);
 		ServerInstance->Modules->AddService(mycommand);
-
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserPreKick, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (mycommand.active)
 		{
-			privs += 'Y';
-			if (op)
+			privs += np->GetModeChar();
+			if (mycommand.op)
 				privs += 'o';
 			return MOD_RES_ALLOW;
 		}
@@ -172,25 +160,14 @@ class ModuleOjoin : public Module
 	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		ConfigTag* Conf = ServerInstance->Config->ConfValue("ojoin");
-
-		if (!np)
-		{
-			// This is done on module load only
-			std::string npre = Conf->getString("prefix");
-			NPrefix = npre.empty() ? 0 : npre[0];
-
-			if (NPrefix && ServerInstance->Modes->FindPrefix(NPrefix))
-				throw ModuleException("Looks like the +Y prefix you picked for m_ojoin is already in use. Pick another.");
-		}
-
-		notice = Conf->getBool("notice", true);
-		op = Conf->getBool("op", true);
+		mycommand.notice = Conf->getBool("notice", true);
+		mycommand.op = Conf->getBool("op", true);
 	}
 
 	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE
 	{
 		// Don't do anything if they're not +Y
-		if (!memb->hasMode('Y'))
+		if (!memb->hasMode(np->GetModeChar()))
 			return MOD_RES_PASSTHRU;
 
 		// Let them do whatever they want to themselves.