X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_motd.cpp;h=b28e57b2f018d2641f15bdc7070aaed264b50c3a;hb=992674362c5f64bdb8e1942eeaa7612524529cd6;hp=80838bcbfc765ff9cb9826df574fa0e21eab53ec;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_motd.cpp b/src/commands/cmd_motd.cpp
index 80838bcbf..b28e57b2f 100644
--- a/src/commands/cmd_motd.cpp
+++ b/src/commands/cmd_motd.cpp
@@ -30,7 +30,7 @@ class CommandMotd : public Command
  public:
 	/** Constructor for motd.
 	 */
-	CommandMotd ( Module* parent) : Command(parent,"MOTD",0,1) { ServerInstance->ProcessedMotdEscapes = false; syntax = "[<servername>]"; }
+	CommandMotd ( Module* parent) : Command(parent,"MOTD",0,1) { syntax = "[<servername>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
@@ -46,61 +46,6 @@ 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
- */
-void ProcessColors(ConfigFileCache::iterator &file)
-{
-	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("", "")
-	};
-
-	for(file_cache::iterator it = file->second.begin(); it != file->second.end(); it++)
-	{
-		std::string ret = *it;
-		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
-		*it = replace_all(ret, "\\\\", "\\");
-	}
-}
-
 /** Handle /MOTD
  */
 CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User *user)
@@ -109,8 +54,9 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
 		return CMD_SUCCESS;
 
 	ConfigTag* tag = NULL;
-	if (IS_LOCAL(user))
-		tag = user->GetClass()->config;
+	LocalUser* localuser = IS_LOCAL(user);
+	if (localuser)
+		tag = localuser->GetClass()->config;
 	std::string motd_name = tag->getString("motd", "motd");
 	ConfigFileCache::iterator motd = ServerInstance->Config->Files.find(motd_name);
 	if (motd == ServerInstance->Config->Files.end())
@@ -120,12 +66,6 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
 		return CMD_SUCCESS;
 	}
 
-	if(!ServerInstance->ProcessedMotdEscapes)
-	{
-		ProcessColors(motd);
-		ServerInstance->ProcessedMotdEscapes = true;
-	}
-
 	user->SendText(":%s %03d %s :%s message of the day", ServerInstance->Config->ServerName.c_str(),
 		RPL_MOTDSTART, user->nick.c_str(), ServerInstance->Config->ServerName.c_str());