X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommands%2Fcmd_map.cpp;h=385a2c7522e910addbb3abb3b727740456cac18f;hb=60b5933a7e0973c0043b72a10d66226c9d1b423c;hp=780caf081f5808cc73e40244388d2d8a3ff8fe52;hpb=f4472dd6dcdfbb5d4a2a50ddc615644c3b2c8145;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_map.cpp b/src/commands/cmd_map.cpp
index 780caf081..385a2c752 100644
--- a/src/commands/cmd_map.cpp
+++ b/src/commands/cmd_map.cpp
@@ -1,37 +1,31 @@
-/*       +------------------------------------+
- *       | 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) 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"
-
-#ifndef __CMD_MAP_H__
-#define __CMD_MAP_H__
 
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 
-/** Handle /MAP. These command handlers can be reloaded by the core,
- * and handle basic RFC1459 commands. Commands within modules work
- * the same way, however, they can be fully unloaded, where these
- * may not.
- */
 class CommandMap : public Command
 {
  public:
 	/** Constructor for map.
 	 */
-	CommandMap (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"MAP",0,0,false,2) { }
+	CommandMap ( Module* parent) : Command(parent,"MAP",0,0) { Penalty=2; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
@@ -41,9 +35,6 @@ class CommandMap : public Command
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 /** Handle /MAP
  */
 CmdResult CommandMap::Handle (const std::vector<std::string>&, User *user)
@@ -51,7 +42,14 @@ CmdResult CommandMap::Handle (const std::vector<std::string>&, User *user)
 	// as with /LUSERS this does nothing without a linking
 	// module to override its behaviour and display something
 	// better.
-	user->WriteNumeric(006, "%s :%s",user->nick.c_str(),ServerInstance->Config->ServerName);
+
+	if (IS_OPER(user))
+	{
+		user->WriteNumeric(006, "%s :%s [%s]", user->nick.c_str(), ServerInstance->Config->ServerName.c_str(), ServerInstance->Config->GetSID().c_str());
+		user->WriteNumeric(007, "%s :End of /MAP", user->nick.c_str());
+		return CMD_SUCCESS;
+	}
+	user->WriteNumeric(006, "%s :%s",user->nick.c_str(),ServerInstance->Config->ServerName.c_str());
 	user->WriteNumeric(007, "%s :End of /MAP",user->nick.c_str());
 
 	return CMD_SUCCESS;