3 files changed, 0 insertions, 120 deletions

diff --git a/modules/core/cs_info.cpp b/modules/core/cs_info.cpp
index 0df02ff43..bae7e118c 100644
--- a/modules/core/cs_info.cpp
+++ b/modules/core/cs_info.cpp
@@ -73,9 +73,6 @@ class CommandCSInfo : public Command
 			u->SendMessage(ChanServ, CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter.c_str());
 		}
 
-		if (!ci->entry_message.empty() && show_all)
-			u->SendMessage(ChanServ, CHAN_INFO_ENTRYMSG, ci->entry_message.c_str());
-
 		if (show_all)
 		{
 			u->SendMessage(ChanServ, CHAN_INFO_BANTYPE, ci->bantype);
diff --git a/modules/core/cs_set_entrymsg.cpp b/modules/core/cs_set_entrymsg.cpp
deleted file mode 100644
index 263e37d91..000000000
--- a/modules/core/cs_set_entrymsg.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2010 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetEntryMsg : public Command
-{
- public:
-	CommandCSSetEntryMsg(const Anope::string &cpermission = "") : Command("ENTRYMSG", 1, 2, cpermission)
-	{
-	}
-
-	CommandReturn Execute(User *u, const std::vector<Anope::string> &params)
-	{
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (!ci)
-			throw CoreException("NULL ci in CommandCSSetEntryMsg");
-
-		if (params.size() > 1)
-		{
-			ci->entry_message = params[1];
-			u->SendMessage(ChanServ, CHAN_ENTRY_MSG_CHANGED, ci->name.c_str(), ci->entry_message.c_str());
-		}
-		else
-		{
-			ci->entry_message.clear();
-			u->SendMessage(ChanServ, CHAN_ENTRY_MSG_UNSET, ci->name.c_str());
-		}
-
-		return MOD_CONT;
-	}
-
-	bool OnHelp(User *u, const Anope::string &)
-	{
-		u->SendMessage(ChanServ, CHAN_HELP_SET_ENTRYMSG, "SET");
-		return true;
-	}
-
-	void OnSyntaxError(User *u, const Anope::string &)
-	{
-		// XXX
-		SyntaxError(ChanServ, u, "SET", CHAN_SET_SYNTAX);
-	}
-
-	void OnServHelp(User *u)
-	{
-		u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_ENTRYMSG);
-	}
-};
-
-class CommandCSSASetEntryMsg : public CommandCSSetEntryMsg
-{
- public:
-	CommandCSSASetEntryMsg() : CommandCSSetEntryMsg("chanserv/saset/entrymsg")
-	{
-	}
-
-	bool OnHelp(User *u, const Anope::string &)
-	{
-		u->SendMessage(ChanServ, CHAN_HELP_SET_ENTRYMSG, "SASET");
-		return true;
-	}
-
-	void OnSyntaxError(User *u, const Anope::string &)
-	{
-		// XXX
-		SyntaxError(ChanServ, u, "SASET", CHAN_SASET_SYNTAX);
-	}
-};
-
-class CSSetEntryMsg : public Module
-{
-	CommandCSSetEntryMsg commandcssetentrymsg;
-	CommandCSSASetEntryMsg commandcssasetentrymsg;
-
- public:
-	CSSetEntryMsg(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
-	{
-		this->SetAuthor("Anope");
-		this->SetType(CORE);
-
-		Command *c = FindCommand(ChanServ, "SET");
-		if (c)
-			c->AddSubcommand(&commandcssetentrymsg);
-
-		c = FindCommand(ChanServ, "SASET");
-		if (c)
-			c->AddSubcommand(&commandcssasetentrymsg);
-	}
-
-	~CSSetEntryMsg()
-	{
-		Command *c = FindCommand(ChanServ, "SET");
-		if (c)
-			c->DelSubcommand(&commandcssetentrymsg);
-
-		c = FindCommand(ChanServ, "SASET");
-		if (c)
-			c->DelSubcommand(&commandcssasetentrymsg);
-	}
-};
-
-MODULE_INIT(CSSetEntryMsg)
diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp
index 3fa235710..953f35b4a 100644
--- a/modules/core/db_plain.cpp
+++ b/modules/core/db_plain.cpp
@@ -776,8 +776,6 @@ class DBPlain : public Module
 		}
 		else if (key.equals_ci("MIG"))
 			ci->memos.ignores.push_back(params[0].ci_str());
-		else if (key.equals_ci("ENTRYMSG"))
-			ci->entry_message = params[0];
 		else if (key.equals_ci("BI"))
 		{
 			if (params[0].equals_ci("NAME"))
@@ -1061,8 +1059,6 @@ class DBPlain : public Module
 			}
 			for (unsigned k = 0, end = memos->ignores.size(); k < end; ++k)
 				db << "MD MIG " << Anope::string(memos->ignores[k]) << endl;
-			if (!ci->entry_message.empty())
-				db << "MD ENTRYMSG :" << ci->entry_message << endl;
 			if (ci->bi)
 				db << "MD BI NAME " << ci->bi->nick << endl;
 			if (ci->botflags.FlagCount())