X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_modules.cpp;h=2a15b43ed841fa675b18cf2c1b186410414dc534;hb=69cb65b695ca9f29e35f95551d4146265934e003;hp=5f7dabdbf609184fe43f047944885b26c8bbdb6e;hpb=aa7cc18468f4b16bf79cd1788cad0cbf0d926817;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp
index 5f7dabdbf..2a15b43ed 100644
--- a/src/commands/cmd_modules.cpp
+++ b/src/commands/cmd_modules.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | 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) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.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/>.
  */
 
+
 #include "inspircd.h"
 
 /** Handle /MODULES. These command handlers can be reloaded by the core,
@@ -23,7 +31,12 @@ class CommandModules : public Command
  public:
 	/** Constructor for modules.
 	 */
-	CommandModules ( Module* parent) : Command(parent,"MODULES",0,0) { syntax = "[server]"; }
+	CommandModules(Module* parent) : Command(parent,"MODULES",0,0)
+	{
+		Penalty = 4;
+		syntax = "[<servername>]";
+	}
+
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
@@ -41,8 +54,11 @@ class CommandModules : public Command
 
 /** Handle /MODULES
  */
-CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
+CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, User *user)
 {
+	if (parameters.size() >= 1 && parameters[0] != ServerInstance->Config->ServerName)
+		return CMD_SUCCESS;
+
 	std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
 
   	for (unsigned int i = 0; i < module_names.size(); i++)
@@ -50,7 +66,7 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
 		Module* m = ServerInstance->Modules->Find(module_names[i]);
 		Version V = m->GetVersion();
 
-		if (user->HasPrivPermission("servers/auspex"))
+		if (IS_LOCAL(user) && user->HasPrivPermission("servers/auspex"))
 		{
 			std::string flags("SvcC");
 			int pos = 0;
@@ -58,16 +74,22 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
 				if (!(V.Flags & mult))
 					flags[pos] = '-';
 
-			ServerInstance->DumpText(user, ":%s 702 %s :%p %s %s :%s - %s", ServerInstance->Config->ServerName.c_str(),
-				user->nick.c_str(), (void*)m, module_names[i].c_str(), flags.c_str(), V.description.c_str(), V.version.c_str());
+#ifdef PURE_STATIC
+			user->SendText(":%s 702 %s :%p %s %s :%s", ServerInstance->Config->ServerName.c_str(),
+				user->nick.c_str(), (void*)m, module_names[i].c_str(), flags.c_str(), V.description.c_str());
+#else
+			std::string srcrev = m->ModuleDLLManager->GetVersion();
+			user->SendText(":%s 702 %s :%p %s %s :%s - %s", ServerInstance->Config->ServerName.c_str(),
+				user->nick.c_str(), (void*)m, module_names[i].c_str(), flags.c_str(), V.description.c_str(), srcrev.c_str());
+#endif
 		}
 		else
 		{
-			ServerInstance->DumpText(user, ":%s 702 %s :%s %s", ServerInstance->Config->ServerName.c_str(),
+			user->SendText(":%s 702 %s :%s %s", ServerInstance->Config->ServerName.c_str(),
 				user->nick.c_str(), module_names[i].c_str(), V.description.c_str());
 		}
 	}
-	ServerInstance->DumpText(user, ":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
+	user->SendText(":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
 
 	return CMD_SUCCESS;
 }