m_namesx, m_uhnames Don't convert the command name to irc::string in OnPreCommand()

[user/henk/code/inspircd.git] / src / modules / m_globalload.cpp

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index be29b00a5db246f2876b19577d847c5119039db9..9a0074cb40164b50e2f1cc95aeb01a721d70be2c 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -1,16 +1,27 @@
-/*       +------------------------------------+
- *       | 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) 2011 Jackmcbarn <jackmcbarn@jackmcbarn.no-ip.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 John Brooks <john.brooks@dereferenced.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/>.
  */
 
+
 /* $ModDesc: Allows global loading of a module. */
 
 #include "inspircd.h"
@@ -96,6 +107,25 @@ class CommandGunloadmodule : public Command
        }
 };
 
+class GReloadModuleWorker : public HandlerBase1<void, bool>
+{
+ public:
+       const std::string nick;
+       const std::string name;
+       const std::string uid;
+       GReloadModuleWorker(const std::string& usernick, const std::string& uuid, const std::string& modn)
+               : nick(usernick), name(modn), uid(uuid) {}
+       void Call(bool result)
+       {
+               ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY RELOADED BY '%s'%s", name.c_str(), nick.c_str(), result ? "" : " (failed here)");
+               User* user = ServerInstance->FindNick(uid);
+               if (user)
+                       user->WriteNumeric(975, "%s %s :Module %ssuccessfully reloaded.",
+                               user->nick.c_str(), name.c_str(), result ? "" : "un");
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
+};
+
 /** Handle /GRELOADMODULE
  */
 class CommandGreloadmodule : public Command
@@ -114,7 +144,7 @@ class CommandGreloadmodule : public Command
                {
                        Module* m = ServerInstance->Modules->Find(parameters[0]);
                        if (m)
-                               ServerInstance->Modules->Reload(m, NULL);
+                               ServerInstance->Modules->Reload(m, new GReloadModuleWorker(user->nick, user->uuid, parameters[0]));
                        else
                        {
                                user->WriteNumeric(975, "%s %s :Could not find module by that name", user->nick.c_str(), parameters[0].c_str());