/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013, 2017-2018, 2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2012, 2014-2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
* Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
- * Copyright (C) 2007, 2009 Robin Burchell <robin+git@viroteck.net>
* Copyright (C) 2007 John Brooks <special@inspircd.org>
+ * Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
*
* 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
#include "inspircd.h"
-/** Handle /GLOADMODULE
- */
-class CommandGloadmodule : public Command
+class CommandGLoadModule : public Command
{
public:
- CommandGloadmodule(Module* Creator) : Command(Creator,"GLOADMODULE", 1)
+ CommandGLoadModule(Module* Creator)
+ : Command(Creator,"GLOADMODULE", 1)
{
+ allow_empty_last_param = false;
flags_needed = 'o';
syntax = "<modulename> [<servermask>]";
}
if (ServerInstance->Modules->Load(parameters[0].c_str()))
{
ServerInstance->SNO->WriteToSnoMask('a', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
- user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded.");
+ user->WriteRemoteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded.");
}
else
{
- user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
+ user->WriteRemoteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
}
}
else
}
};
-/** Handle /GUNLOADMODULE
- */
-class CommandGunloadmodule : public Command
+class CommandGUnloadModule : public Command
{
public:
- CommandGunloadmodule(Module* Creator) : Command(Creator,"GUNLOADMODULE", 1)
+ bool allowcoreunload;
+
+ CommandGUnloadModule(Module* Creator)
+ : Command(Creator,"GUNLOADMODULE", 1)
{
+ allow_empty_last_param = false;
flags_needed = 'o';
syntax = "<modulename> [<servermask>]";
}
CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
{
- if (!ServerInstance->Config->ConfValue("security")->getBool("allowcoreunload") &&
- InspIRCd::Match(parameters[0], "core_*.so", ascii_case_insensitive_map))
+ if (!allowcoreunload && InspIRCd::Match(parameters[0], "core_*.so", ascii_case_insensitive_map))
{
- user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot unload core commands!");
+ user->WriteRemoteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot unload core commands!");
return CMD_FAILURE;
}
}
else
{
- user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
+ user->WriteRemoteNumeric(ERR_CANTUNLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
}
}
else
}
};
-/** Handle /GRELOADMODULE
- */
-class CommandGreloadmodule : public Command
+class CommandGReloadModule : public Command
{
public:
- CommandGreloadmodule(Module* Creator) : Command(Creator, "GRELOADMODULE", 1)
+ CommandGReloadModule(Module* Creator)
+ : Command(Creator, "GRELOADMODULE", 1)
{
+ allow_empty_last_param = false;
flags_needed = 'o';
syntax = "<modulename> [<servermask>]";
}
}
else
{
- user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
+ user->WriteRemoteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "Could not find module by that name");
return CMD_FAILURE;
}
}
class ModuleGlobalLoad : public Module
{
- CommandGloadmodule cmd1;
- CommandGunloadmodule cmd2;
- CommandGreloadmodule cmd3;
+ private:
+ CommandGLoadModule cmdgloadmodule;
+ CommandGUnloadModule cmdgunloadmodule;
+ CommandGReloadModule cmdgreloadmodule;
public:
ModuleGlobalLoad()
- : cmd1(this), cmd2(this), cmd3(this)
+ : cmdgloadmodule(this)
+ , cmdgunloadmodule(this)
+ , cmdgreloadmodule(this)
+ {
+ }
+
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
+ ConfigTag* securitytag = ServerInstance->Config->ConfValue("security");
+ cmdgunloadmodule.allowcoreunload = securitytag->getBool("allowcoreunload");
}
Version GetVersion() CXX11_OVERRIDE