Always process MOTD formatting escape codes.

The options for disabling these were added to keep compatibility
with previous 2.0 releases and are not needed any more.

3 files changed, 2 insertions, 8 deletions

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 7941e4844..c9fa62510 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -624,9 +624,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	for (ClassVector::const_iterator it = this->Classes.begin(), it_end = this->Classes.end(); it != it_end; ++it)
 	{
 		ConfigTag *tag = (*it)->config;
-		// Make sure our connection class allows motd colors
-		if(!tag->getBool("allowmotdcolors"))
-			continue;
 
 		ConfigFileCache::iterator file = this->Files.find(tag->getString("motd", "motd"));
 		if (file != this->Files.end())
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 30f2ce303..6884cd447 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -100,14 +100,12 @@ class ModuleOpermotd : public Module
 		{
 			FileReader reader(conf->getString("file", "opermotd"));
 			cmd.opermotd = reader.GetVector();
+			InspIRCd::ProcessColors(cmd.opermotd);
 		}
 		catch (CoreException&)
 		{
 			// Nothing happens here as we do the error handling in ShowOperMOTD.
 		}
-
-		if (conf->getBool("processcolors"))
-			InspIRCd::ProcessColors(cmd.opermotd);
 	}
 };
 
diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index 2d1354aff..83030b7a1 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -91,8 +91,7 @@ class CommandShowFile : public Command
 			method = SF_NOTICE;
 
 		contents = filecontents;
-		if (tag->getBool("colors"))
-			InspIRCd::ProcessColors(contents);
+		InspIRCd::ProcessColors(contents);
 	}
 };