Replace hardcoded mode letters, part 3

[user/henk/code/inspircd.git] / src / commands / cmd_modules.cpp

diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp
index 1b0f1da132998e1b602a45819e91c2d83ac21e88..b8a1805b0a8020c5e2bcf8316451daf86d100dbd 100644 (file)
--- 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,
@@ -52,22 +60,28 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
 
                if (user->HasPrivPermission("servers/auspex"))
                {
-                       std::string flags("SvscC");
+                       std::string flags("SvcC");
                        int pos = 0;
                        for (int mult = 1; mult <= VF_OPTCOMMON; mult *= 2, ++pos)
                                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;
 }