X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=78993caad8799a76d1d70e968a4e83a7908701ca;hb=090e7b616104723960ab51d8faa966af333eb15d;hp=da8f10294ff89149f9e8f445774b7dc7f17db028;hpb=526f5a4a02882b19056fe755dff1f64b764ff313;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index da8f10294..78993caad 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,9 +12,6 @@
  */
 
 /* $Core */
-/* $ExtraDeps: $(RELCPPFILES) */
-/* $ExtraObjects: modes/modeclasses.a */
-/* $ExtraBuild: @${MAKE} -C "modes" DIRNAME="src/modes" CC="$(CC)" $(MAKEARGS) CPPFILES="$(CPPFILES)" */
 
 #include "inspircd.h"
 #include "inspstring.h"
@@ -68,6 +65,8 @@ bool ModeHandler::IsListMode()
 
 char ModeHandler::GetNeededPrefix()
 {
+	if (prefixneeded == '%' && !ServerInstance->Config->AllowHalfop)
+		return '@';
 	return prefixneeded;
 }
 
@@ -371,6 +370,8 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 	User* targetuser  = ServerInstance->FindNick(parameters[0]);
 
 	LastParse.clear();
+	LastParseParams.clear();
+	LastParseTranslate.clear();
 
 	/* Special case for displaying the list for listmodes,
 	 * e.g. MODE #chan b, or MODE #chan +b without a parameter
@@ -475,9 +476,12 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 
 			if ((IS_LOCAL(user)) && (!ServerInstance->ULine(user->server)) && (!servermode))
 			{
+				/* Make modes that are being changed visible to OnAccessCheck */
+				LastParse = parameters[1];
 				/* We don't have halfop */
 				int MOD_RESULT = 0;
 				FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, targetchannel, AC_GENERAL_MODE));
+				LastParse.clear();
 				if (MOD_RESULT == ACR_DENY)
 					return;
 				SkipAccessChecks = (MOD_RESULT == ACR_ALLOW);
@@ -503,14 +507,13 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 		std::string mode_sequence = parameters[1];
 		std::string parameter;
 		std::ostringstream parameter_list;
-		std::vector<TranslateType> parameter_xlate;
-		parameter_xlate.push_back(TR_TEXT);
 		std::string output_sequence;
 		bool adding = true, state_change = false;
 		unsigned char handler_id = 0;
 		unsigned int parameter_counter = 2; /* Index of first parameter */
 		unsigned int parameter_count = 0;
 		bool last_successful_state_change = false;
+		LastParseTranslate.push_back(TR_TEXT);
 
 		/* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */
 		if ((*mode_sequence.begin() != '+') && (*mode_sequence.begin() != '-'))
@@ -608,10 +611,10 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 									/* If the mode defined by the handler is not '\0', but the handler for it
 									 * cannot be found, they probably dont have the right module loaded to implement
 									 * the prefix they want to compare the mode against, e.g. '&' for m_chanprotect.
-									 * Revert to checking against the minimum core prefix, '%'.
+									 * Revert to checking against the minimum core prefix, '%' or '@'.
 									 */
 									if (needed && !prefixmode)
-										prefixmode = FindPrefix('%');
+										prefixmode = ServerInstance->Config->AllowHalfop ? FindPrefix('%') : FindPrefix('@');
 
 									unsigned int neededrank = prefixmode->GetPrefixRank();
 									/* Compare our rank on the channel against the rank of the required prefix,
@@ -717,7 +720,8 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 								if ((modehandlers[handler_id]->GetNumParams(adding)) && (!parameter.empty()))
 								{
 									parameter_list << " " << parameter;
-									parameter_xlate.push_back(modehandlers[handler_id]->GetTranslateType());
+									LastParseParams.push_back(parameter);
+									LastParseTranslate.push_back(modehandlers[handler_id]->GetTranslateType());
 									parameter_count++;
 									/* Does this mode have a prefix? */
 									if (modehandlers[handler_id]->GetPrefix() && targetchannel)
@@ -758,7 +762,8 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 		/* Was there at least one valid mode in the sequence? */
 		if (!output_sequence.empty())
 		{
-			if (servermode)
+			LastParseParams.push_front(output_sequence);
+			if (!user)
 			{
 				if (type == MODETYPE_CHANNEL)
 				{
@@ -776,13 +781,13 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 				if (type == MODETYPE_CHANNEL)
 				{
 					targetchannel->WriteChannel(user, "MODE %s %s%s", targetchannel->name.c_str(), output_sequence.c_str(), parameter_list.str().c_str());
-					FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str(), parameter_xlate));
+					FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, LastParseParams, LastParseTranslate));
 					this->LastParse = targetchannel->name;
 				}
 				else
 				{
 					user->WriteTo(targetuser, "MODE %s %s%s", targetuser->nick.c_str(), output_sequence.c_str(), parameter_list.str().c_str());
-					FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence + parameter_list.str(), parameter_xlate));
+					FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, LastParseParams, LastParseTranslate));
 					this->LastParse = targetuser->nick;
 				}
 			}
@@ -1156,7 +1161,7 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 			sprintf(moderemove,"-%c",this->GetModeChar());
 			parameters.push_back(user->nick);
 			parameters.push_back(moderemove);
-			ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient, false);
+			ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient, true);
 		}
 	}
 }