Release v2.0.19

[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 50032919a0dac9bbea03d4b244d2f89e4c9b36f0..aed65045f58d78c9d5577e3a66e6a6834844de64 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-2009 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"
@@ -73,16 +84,21 @@ class CommandGunloadmodule : public Command
                if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
                {
                        Module* m = ServerInstance->Modules->Find(parameters[0]);
-                       if (m && ServerInstance->Modules->Unload(m))
+                       if (m)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-                               ServerInstance->DumpText(user, ":%s 973 %s %s :Module successfully unloaded.",
-                                       ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
+                               if (ServerInstance->Modules->Unload(m))
+                               {
+                                       ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+                                       user->SendText(":%s 973 %s %s :Module successfully unloaded.",
+                                               ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
+                               }
+                               else
+                               {
+                                       user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+                               }
                        }
                        else
-                       {
-                               user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
-                       }
+                               user->SendText(":%s 972 %s %s :No such module", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
                }
                else
                        ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str());
@@ -96,6 +112,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
@@ -113,7 +148,18 @@ class CommandGreloadmodule : public Command
                if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
                {
                        Module* m = ServerInstance->Modules->Find(parameters[0]);
-                       ServerInstance->Modules->Reload(m, NULL);
+                       if (m)
+                       {
+                               GReloadModuleWorker* worker = NULL;
+                               if ((m != creator) && (!creator->dying))
+                                       worker = new GReloadModuleWorker(user->nick, user->uuid, parameters[0]);
+                               ServerInstance->Modules->Reload(m, worker);
+                       }
+                       else
+                       {
+                               user->WriteNumeric(975, "%s %s :Could not find module by that name", user->nick.c_str(), parameters[0].c_str());
+                               return CMD_FAILURE;
+                       }
                }
                else
                        ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), user->nick.c_str());
@@ -137,9 +183,13 @@ class ModuleGlobalLoad : public Module
        ModuleGlobalLoad()
                : cmd1(this), cmd2(this), cmd3(this)
        {
-               ServerInstance->AddCommand(&cmd1);
-               ServerInstance->AddCommand(&cmd2);
-               ServerInstance->AddCommand(&cmd3);
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(cmd1);
+               ServerInstance->Modules->AddService(cmd2);
+               ServerInstance->Modules->AddService(cmd3);
        }
 
        ~ModuleGlobalLoad()