1 files changed, 33 insertions, 75 deletions

diff --git a/modules/extra/cs_set_misc.cpp b/modules/extra/cs_set_misc.cpp
index 000e25ab1..4bc12efd8 100644
--- a/modules/extra/cs_set_misc.cpp
+++ b/modules/extra/cs_set_misc.cpp
@@ -14,11 +14,9 @@
 
 class CommandCSSetMisc : public Command
 {
-	Anope::string Desc;
  public:
-	CommandCSSetMisc(Module *creator, const Anope::string &cname, const Anope::string &cdesc, const Anope::string &cpermission = "") : Command(creator, "chanserv/set/" + cname, 1, 2, cpermission), Desc(cdesc)
+	CommandCSSetMisc(Module *creator, const Anope::string &cname = "chanserv/set/misc", const Anope::string &cpermission = "") : Command(creator, cname, 1, 2, cpermission)
 	{
-		this->SetDesc(cdesc);
 		this->SetSyntax(_("\037channel\037 \037parameters\037"));
 	}
 
@@ -31,119 +29,79 @@ class CommandCSSetMisc : public Command
 			return;
 		}
 
-		ci->Shrink("chanserv:" + this->name);
+		ci->Shrink("cs_set_misc:" + source.command.replace_all_cs(" ", "_"));
 		if (params.size() > 1)
 		{
-			ci->Extend("chanserv:" + this->name, new ExtensibleItemRegular<Anope::string>(params[1]));
-			source.Reply(CHAN_SETTING_CHANGED, this->name.c_str(), ci->name.c_str(), params[1].c_str());
+			ci->Extend("cs_set_misc:" + source.command.replace_all_cs(" ", "_"), new ExtensibleItemRegular<Anope::string>(params[1]));
+			source.Reply(CHAN_SETTING_CHANGED, source.command.c_str(), ci->name.c_str(), params[1].c_str());
 		}
 		else
-			source.Reply(CHAN_SETTING_UNSET, this->name.c_str(), ci->name.c_str());
-
-		return;
+			source.Reply(CHAN_SETTING_UNSET, source.command.c_str(), ci->name.c_str());
 	}
 };
 
 class CommandCSSASetMisc : public CommandCSSetMisc
 {
  public:
-	CommandCSSASetMisc(Module *creator, const Anope::string &cname, const Anope::string &cdesc) : CommandCSSetMisc(creator, cname, cdesc, "chanserv/saset/" + cname)
+	CommandCSSASetMisc(Module *creator) : CommandCSSetMisc(creator, "chanserv/saset/misc", "chanserv/saset/misc")
 	{
 	}
 };
 
 class CSSetMisc : public Module
 {
-	struct CommandInfo
-	{
-		Anope::string Name;
-		Anope::string Desc;
-		bool ShowHidden;
-		Command *c;
-
-		CommandInfo(const Anope::string &name, const Anope::string &desc, bool showhidden) : Name(name), Desc(desc), ShowHidden(showhidden) { }
-	};
-
-	std::map<Anope::string, CommandInfo *> Commands;
-
-	void RemoveAll()
-	{
-		for (std::map<Anope::string, CommandInfo *>::const_iterator it = this->Commands.begin(), it_end = this->Commands.end(); it != it_end; ++it)
-			delete it->second;
-		this->Commands.clear();
-	}
+	CommandCSSetMisc commandcssetmisc;
+	CommandCSSASetMisc commandcssasetmisc;
 
  public:
-	CSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, SUPPORTED)
+	CSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, SUPPORTED),
+		commandcssetmisc(this), commandcssasetmisc(this)
 	{
 		this->SetAuthor("Anope");
 
-		Implementation i[] = { I_OnReload, I_OnChanInfo, I_OnDatabaseWriteMetadata, I_OnDatabaseReadMetadata };
-		ModuleManager::Attach(i, this, 4);
+		Implementation i[] = { I_OnChanInfo, I_OnDatabaseWriteMetadata, I_OnDatabaseReadMetadata };
+		ModuleManager::Attach(i, this, 3);
 
-		OnReload();
-	}
-
-	~CSSetMisc()
-	{
-		RemoveAll();
-	}
-
-	void OnReload()
-	{
-		RemoveAll();
-
-		ConfigReader config;
-
-		for (int i = 0, num = config.Enumerate("cs_set_misc"); i < num; ++i)
-		{
-			Anope::string cname = config.ReadValue("cs_set_misc", "name", "", i);
-			if (cname.empty())
-				continue;
-			Anope::string desc = config.ReadValue("cs_set_misc", "desc", "", i);
-			bool showhidden = config.ReadFlag("cs_set_misc", "privileged", "no", i);
-
-			CommandInfo *info = new CommandInfo(cname, desc, showhidden);
-			if (!this->Commands.insert(std::make_pair(cname, info)).second)
-			{
-				Log() << "cs_set_misc: Warning, unable to add duplicate entry " << cname;
-				delete info;
-				continue;
-			}
-
-			ModuleManager::RegisterService(new CommandCSSetMisc(this, cname, desc));
-			ModuleManager::RegisterService(new CommandCSSASetMisc(this, cname, desc));
-		}
+		ModuleManager::RegisterService(&this->commandcssetmisc);
+		ModuleManager::RegisterService(&this->commandcssasetmisc);
 	}
 
 	void OnChanInfo(CommandSource &source, ChannelInfo *ci, bool ShowHidden)
 	{
-		for (std::map<Anope::string, CommandInfo *>::const_iterator it = this->Commands.begin(), it_end = this->Commands.end(); it != it_end; ++it)
+		std::deque<Anope::string> list;
+		ci->GetExtList(list);
+
+		for (unsigned i = 0; i < list.size(); ++i)
 		{
-			if (!ShowHidden && it->second->ShowHidden)
+			if (list[i].find("cs_set_misc:") != 0)
 				continue;
-
+			
 			Anope::string value;
-			if (ci->GetExtRegular("chanserv:" + it->first, value))
-				source.Reply("      %s: %s", it->first.c_str(), value.c_str());
+			if (ci->GetExtRegular(list[i], value))
+				source.Reply("      %s: %s", list[i].substr(12).replace_all_cs("_", " ").c_str(), value.c_str());
 		}
 	}
 
 	void OnDatabaseWriteMetadata(void (*WriteMetadata)(const Anope::string &, const Anope::string &), ChannelInfo *ci)
 	{
-		for (std::map<Anope::string, CommandInfo *>::const_iterator it = this->Commands.begin(), it_end = this->Commands.end(); it != it_end; ++it)
+		std::deque<Anope::string> list;
+		ci->GetExtList(list);
+
+		for (unsigned i = 0; i < list.size(); ++i)
 		{
+			if (list[i].find("cs_set_misc:") != 0)
+				continue;
+
 			Anope::string value;
-			if (ci->GetExtRegular("chanserv:" + it->first, value))
-				WriteMetadata(it->first, ":" + value);
+			if (ci->GetExtRegular(list[i], value))
+				WriteMetadata(list[i], ":" + value);
 		}
 	}
 
 	EventReturn OnDatabaseReadMetadata(ChannelInfo *ci, const Anope::string &key, const std::vector<Anope::string> &params)
 	{
-		for (std::map<Anope::string, CommandInfo *>::const_iterator it = this->Commands.begin(), it_end = this->Commands.end(); it != it_end; ++it)
-			if (key == it->first)
-				ci->Extend("chanserv:" + it->first, new ExtensibleItemRegular<Anope::string>(params[0]));
+		if (key.find("cs_set_misc:") == 0)
+			ci->Extend(key, new ExtensibleItemRegular<Anope::string>(params[0]));
 
 		return EVENT_CONTINUE;
 	}