X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customprefix.cpp;h=f6f9a84f691220925fd04342a27b2301b897dc9a;hb=43b5073d6f80a8dcb7044ecd127fd5893da033ab;hp=48a04d078edf5c6aa21dc7eadb4cb590479574e5;hpb=4ab1c43c1eee708fc50a4808f714a731891b75e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp
index 48a04d078..f6f9a84f6 100644
--- a/src/modules/m_customprefix.cpp
+++ b/src/modules/m_customprefix.cpp
@@ -19,78 +19,30 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Allows custom prefix modes to be created. */
-
-class CustomPrefixMode : public ModeHandler
+class CustomPrefixMode : public PrefixMode
 {
  public:
 	reference<ConfigTag> tag;
-	int rank;
 	bool depriv;
+
 	CustomPrefixMode(Module* parent, ConfigTag* Tag)
-		: ModeHandler(parent, Tag->getString("name"), 0, PARAM_ALWAYS, MODETYPE_CHANNEL), tag(Tag)
+		: PrefixMode(parent, Tag->getString("name"), 0, Tag->getInt("rank"))
+		, tag(Tag)
 	{
-		list = true;
-		m_paramtype = TR_NICK;
 		std::string v = tag->getString("prefix");
 		prefix = v.c_str()[0];
 		v = tag->getString("letter");
 		mode = v.c_str()[0];
-		rank = tag->getInt("rank");
-		levelrequired = tag->getInt("ranktoset", rank);
+		levelrequired = tag->getInt("ranktoset", prefixrank);
 		depriv = tag->getBool("depriv", true);
 	}
 
-	unsigned int GetPrefixRank()
-	{
-		return rank;
-	}
-
 	ModResult AccessCheck(User* src, Channel*, std::string& value, bool adding)
 	{
 		if (!adding && src->nick == value && depriv)
 			return MOD_RES_ALLOW;
 		return MOD_RES_PASSTHRU;
 	}
-
-	void RemoveMode(Channel* channel, irc::modestacker* stack)
-	{
-		const UserMembList* cl = channel->GetUsers();
-		std::vector<std::string> mode_junk;
-		mode_junk.push_back(channel->name);
-		irc::modestacker modestack(false);
-		std::vector<std::string> stackresult;
-
-		for (UserMembCIter i = cl->begin(); i != cl->end(); i++)
-		{
-			if (i->second->hasMode(mode))
-			{
-				if (stack)
-					stack->Push(this->GetModeChar(), i->first->nick);
-				else
-					modestack.Push(this->GetModeChar(), i->first->nick);
-			}
-		}
-
-		if (stack)
-			return;
-
-		while (modestack.GetStackedLine(stackresult))
-		{
-			mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
-			ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
-			mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
-		}
-	}
-
-	void RemoveMode(User* user, irc::modestacker* stack)
-	{
-	}
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-	{
-		return MODEACTION_ALLOW;
-	}
 };
 
 class ModuleCustomPrefix : public Module
@@ -106,7 +58,7 @@ class ModuleCustomPrefix : public Module
 			tags.first++;
 			CustomPrefixMode* mh = new CustomPrefixMode(this, tag);
 			modes.push_back(mh);
-			if (mh->rank <= 0)
+			if (mh->GetPrefixRank() == 0)
 				throw ModuleException("Rank must be specified for prefix at " + tag->getTagLocation());
 			if (!isalpha(mh->GetModeChar()))
 				throw ModuleException("Mode must be a letter for prefix at " + tag->getTagLocation());
@@ -116,15 +68,14 @@ class ModuleCustomPrefix : public Module
 			}
 			catch (ModuleException& e)
 			{
-				throw ModuleException(e.err + " (while creating mode from " + tag->getTagLocation() + ")");
+				throw ModuleException(e.GetReason() + " (while creating mode from " + tag->getTagLocation() + ")");
 			}
 		}
 	}
 
 	~ModuleCustomPrefix()
 	{
-		for (std::vector<CustomPrefixMode*>::iterator i = modes.begin(); i != modes.end(); i++)
-			delete *i;
+		stdalgo::delete_all(modes);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE