X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=873609d259d363e081b8541ccd57ba1e9c7c2ecb;hb=cfac6a9562764dd1530ed39767630e26934c4685;hp=ef82cccdc895ba85e3d4abebab2f7f080ed74c5a;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index ef82cccdc..873609d25 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -46,7 +46,7 @@
 #include "modes/umode_s.h"
 
 ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type)
-	: ServiceProvider(Creator, Name, type == MODETYPE_CHANNEL ? SERVICE_CMODE : SERVICE_UMODE), m_paramtype(TR_TEXT),
+	: ServiceProvider(Creator, Name, SERVICE_MODE), m_paramtype(TR_TEXT),
 	parameters_taken(Params), mode(modeletter), prefix(0), oper(false),
 	list(false), m_type(type), levelrequired(HALFOP_VALUE)
 {
@@ -61,8 +61,6 @@ CullResult ModeHandler::cull()
 
 ModeHandler::~ModeHandler()
 {
-	if (ServerInstance && ServerInstance->Modes && ServerInstance->Modes->FindMode(mode, m_type) == this)
-		ServerInstance->Logs->Log("MODE", ERROR, "ERROR: Destructor for mode %c called while still registered", mode);
 }
 
 bool ModeHandler::IsListMode()
@@ -265,6 +263,10 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
 	ModeHandler *mh = FindMode(modechar, type);
 	int pcnt = mh->GetNumParams(adding);
 
+	// crop mode parameter size to 250 characters
+	if (parameter.length() > 250 && adding)
+		parameter = parameter.substr(0, 250);
+
 	ModResult MOD_RESULT;
 	FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, modechar, parameter, adding, pcnt));
 
@@ -288,11 +290,23 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
 			unsigned int ourrank = chan->GetPrefixValue(user);
 			if (ourrank < neededrank)
 			{
-				/* Bog off */
-				// TODO replace with a real search for the proper prefix
-				char needed = neededrank > HALFOP_VALUE ? '@' : '%';
-				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel privilege %c or above to %sset channel mode %c",
-						user->nick.c_str(), chan->name.c_str(), needed, adding ? "" : "un", modechar);
+				ModeHandler* neededmh = NULL;
+				for(char c='A'; c <= 'z'; c++)
+				{
+					ModeHandler *privmh = FindMode(c, MODETYPE_CHANNEL);
+					if (privmh && privmh->GetPrefixRank() >= neededrank)
+					{
+						// this mode is sufficient to allow this action
+						if (!neededmh || privmh->GetPrefixRank() < neededmh->GetPrefixRank())
+							neededmh = privmh;
+					}
+				}
+				if (neededmh)
+					user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel %s access or above to %sset channel mode %c",
+						user->nick.c_str(), chan->name.c_str(), neededmh->name.c_str(), adding ? "" : "un", modechar);
+				else
+					user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You cannot %sset channel mode %c",
+						user->nick.c_str(), chan->name.c_str(), adding ? "" : "un", modechar);
 				return MODEACTION_DENY;
 			}
 		}
@@ -551,13 +565,11 @@ void ModeParser::DisplayListModes(User* user, Channel* chan, std::string &mode_s
 		bool display = true;
 		if (!user->HasPrivPermission("channels/auspex") && ServerInstance->Config->HideModeLists[mletter] && (chan->GetPrefixValue(user) < HALFOP_VALUE))
 		{
-			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only half-operators and above may view the +%c list",
+			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You do not have access to view the +%c list",
 				user->nick.c_str(), chan->name.c_str(), mletter);
 			display = false;
 		}
 
-		/** See below for a description of what craq this is :D
-		 */
 		unsigned char handler_id = (mletter - 'A') | MASK_CHANNEL;
 
 		for(ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
@@ -634,6 +646,9 @@ bool ModeParser::AddMode(ModeHandler* mh)
 	if ((mh->GetPrefix() == ',') || (mh->GetPrefix() == ':') || (mh->GetPrefix() == '#'))
 		return false;
 
+	if (mh->GetPrefix() && FindPrefix(mh->GetPrefix()))
+		return false;
+
 	mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
 	pos = (mh->GetModeChar()-65) | mask;
 
@@ -937,7 +952,6 @@ struct builtin_modes
 
 	ModeChannelBan b;
 	ModeChannelOp o;
-	// halfop is added by configreader
 	ModeChannelVoice v;
 
 	ModeUserWallops uw;