X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_motd.cpp;h=9ed5ff188079fa1a86e3bc4737e128470c471425;hb=748b3a0d89e7ecc9a766471b79fb78f63a5ca2bb;hp=0b73beb5bf03d2a630826baa4d6caadfb150526b;hpb=183fd751d319f6106e5e50057155d6f156a90e02;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_motd.cpp b/src/commands/cmd_motd.cpp
index 0b73beb5b..9ed5ff188 100644
--- a/src/commands/cmd_motd.cpp
+++ b/src/commands/cmd_motd.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 /MOTD. These command handlers can be reloaded by the core,
@@ -39,66 +46,20 @@ class CommandMotd : public Command
 	}
 };
 
-inline std::string replace_all(const std::string &str, const std::string &orig, const std::string &repl)
-{
-	std::string new_str = str;
-	std::string::size_type pos = new_str.find(orig), orig_length = orig.length(), repl_length = repl.length();
-	while (pos != std::string::npos)
-	{
-		new_str = new_str.substr(0, pos) + repl + new_str.substr(pos + orig_length);
-		pos = new_str.find(orig, pos + repl_length);
-	}
-	return new_str;
-}
-
-/*
- * Replace all color codes from the special[] array to actual
- * color code chars using C++ style escape sequences. You
- * can append other chars to replace if you like (such as %U
- * being underline). -- Justasic
- */
-std::string ProcessColors(const std::string &string)
-{
-	static struct special_chars
-	{
-		std::string character;
-		std::string replace;
-		special_chars(const std::string &c, const std::string &r) : character(c), replace(r) { }
-	}
-
-	special[] = {
-		special_chars("\\002", "\002"),  // Bold
-                special_chars("\\037", "\037"),  // underline
-                special_chars("\\003", "\003"),  // Color
-		special_chars("\\0017", "\017"), // Stop colors
-		special_chars("\\u", "\037"),    // Alias for underline
-		special_chars("\\b", "\002"),    // Alias for Bold
-		special_chars("\\x", "\017"),    // Alias for stop
-		special_chars("\\c", "\003"),    // Alias for color
-                special_chars("", "")
-	};
-
-	std::string ret = string;
-	for(int i = 0; special[i].character.empty() == false; ++i)
-	{
-		std::string::size_type pos = ret.find(special[i].character);
-		if(pos != std::string::npos && ret[pos-1] == '\\' && ret[pos] == '\\')
-			continue; // Skip double slashes.
-
-		ret = replace_all(ret, special[i].character, special[i].replace);
-	}
-	// Replace double slashes with a single slash before we return
-	return replace_all(ret, "\\\\", "\\");
-}
-
 /** Handle /MOTD
  */
 CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName)
+	{
+		// Give extra penalty if a non-oper queries the /MOTD of a remote server
+		LocalUser* localuser = IS_LOCAL(user);
+		if ((localuser) && (!IS_OPER(user)))
+			localuser->CommandFloodPenalty += 2000;
 		return CMD_SUCCESS;
+	}
 
-	ConfigTag* tag = NULL;
+	ConfigTag* tag = ServerInstance->Config->EmptyTag;
 	if (IS_LOCAL(user))
 		tag = user->GetClass()->config;
 	std::string motd_name = tag->getString("motd", "motd");
@@ -114,7 +75,7 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
 		RPL_MOTDSTART, user->nick.c_str(), ServerInstance->Config->ServerName.c_str());
 
 	for (file_cache::iterator i = motd->second.begin(); i != motd->second.end(); i++)
-		user->SendText(":%s %03d %s :- %s", ServerInstance->Config->ServerName.c_str(), RPL_MOTD, user->nick.c_str(), ProcessColors(*i).c_str());
+		user->SendText(":%s %03d %s :- %s", ServerInstance->Config->ServerName.c_str(), RPL_MOTD, user->nick.c_str(), i->c_str());
 
 	user->SendText(":%s %03d %s :End of message of the day.", ServerInstance->Config->ServerName.c_str(), RPL_ENDOFMOTD, user->nick.c_str());