X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=98b0f98540449f4543628c7620da7b5d54310014;hb=4aa27e75af8da0a5bc2e35f931f0165339f5f289;hp=fd5e307074e2aea1e0ee0bf97f22f2fe3eefdf8b;hpb=12c67fb0e5de72c127f62a1eed6cd5e5627f3c91;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index fd5e30707..98b0f9854 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -27,9 +27,16 @@
 #include "builtinmodes.h"
 
 ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type, Class mclass)
-	: ServiceProvider(Creator, Name, SERVICE_MODE), modeid(ModeParser::MODEID_MAX),
-	parameters_taken(Params), mode(modeletter), oper(false),
-	list(false), m_type(type), type_id(mclass), levelrequired(HALFOP_VALUE)
+	: ServiceProvider(Creator, Name, SERVICE_MODE)
+	, modeid(ModeParser::MODEID_MAX)
+	, parameters_taken(Params)
+	, mode(modeletter)
+	, oper(false)
+	, list(false)
+	, m_type(type)
+	, type_id(mclass)
+	, ranktoset(HALFOP_VALUE)
+	, ranktounset(HALFOP_VALUE)
 {
 }
 
@@ -155,11 +162,20 @@ void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool)
 
 PrefixMode::PrefixMode(Module* Creator, const std::string& Name, char ModeLetter, unsigned int Rank, char PrefixChar)
 	: ModeHandler(Creator, Name, ModeLetter, PARAM_ALWAYS, MODETYPE_CHANNEL, MC_PREFIX)
-	, prefix(PrefixChar), prefixrank(Rank)
+	, prefix(PrefixChar)
+	, prefixrank(Rank)
+	, selfremove(true)
 {
 	list = true;
 }
 
+ModResult PrefixMode::AccessCheck(User* src, Channel*, std::string& value, bool adding)
+{
+	if (!adding && src->nick == value && selfremove)
+		return MOD_RES_ALLOW;
+	return MOD_RES_PASSTHRU;
+}
+
 ModeAction PrefixMode::OnModeChange(User* source, User*, Channel* chan, std::string& parameter, bool adding)
 {
 	User* target;
@@ -182,6 +198,14 @@ ModeAction PrefixMode::OnModeChange(User* source, User*, Channel* chan, std::str
 	return (memb->SetPrefix(this, adding) ? MODEACTION_ALLOW : MODEACTION_DENY);
 }
 
+void PrefixMode::Update(unsigned int rank, unsigned int setrank, unsigned int unsetrank, bool selfrm)
+{
+	prefixrank = rank;
+	ranktoset = setrank;
+	ranktounset = unsetrank;
+	selfremove = selfrm;
+}
+
 ModeAction ParamModeBase::OnModeChange(User* source, User*, Channel* chan, std::string& parameter, bool adding)
 {
 	if (adding)
@@ -237,7 +261,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, Mode
 			return MODEACTION_DENY;
 		if (MOD_RESULT == MOD_RES_PASSTHRU)
 		{
-			unsigned int neededrank = mh->GetLevelRequired();
+			unsigned int neededrank = mh->GetLevelRequired(adding);
 			/* Compare our rank on the channel against the rank of the required prefix,
 			 * allow if >= ours. Because mIRC and xchat throw a tizz if the modes shown
 			 * in NAMES(X) are not in rank order, we know the most powerful mode is listed