X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=f2bbb98e5e7f5e4bdd89eeeead634d8b096d6321;hb=c4d7f00f7497e107f00d9dcf1dea49ddba14297e;hp=faa70a29f082438e0fd381f548bbf7918bcf3b27;hpb=ca781714c1651a9e7042eb930c6b117449f8e1fc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index faa70a29f..f2bbb98e5 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDmode */
+/* $Core */
 /* $ExtraDeps: $(RELCPPFILES) */
 /* $ExtraObjects: modes/modeclasses.a */
 /* $ExtraBuild: @${MAKE} -C "modes" DIRNAME="src/modes" CC="$(CC)" $(MAKEARGS) CPPFILES="$(CPPFILES)" */
@@ -43,16 +43,14 @@
 #include "modes/cmode_h.h"
 /* +v (channel voice) */
 #include "modes/cmode_v.h"
-/* +s (server notices) */
-#include "modes/umode_s.h"
 /* +w (see wallops) */
 #include "modes/umode_w.h"
 /* +i (invisible) */
 #include "modes/umode_i.h"
 /* +o (operator) */
 #include "modes/umode_o.h"
-/* +n (notice mask - our implementation of snomasks) */
-#include "modes/umode_n.h"
+/* +s (server notice masks) */
+#include "modes/umode_s.h"
 
 ModeHandler::ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix, char prefixrequired)
 	: ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly), prefix(mprefix), count(0), prefixneeded(prefixrequired)
@@ -119,6 +117,11 @@ char ModeHandler::GetModeChar()
 	return mode;
 }
 
+std::string ModeHandler::GetUserParameter(User* user)
+{
+	return "";
+}
+
 ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool, bool)
 {
 	return MODEACTION_DENY;
@@ -144,6 +147,10 @@ void ModeHandler::DisplayEmptyList(User*, Channel*)
 {
 }
 
+void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
+{
+}
+
 bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*)
 {
 	return (ours < theirs);
@@ -167,10 +174,6 @@ SimpleChannelModeHandler::SimpleChannelModeHandler(InspIRCd* Instance, char mode
 
 ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode)
 {
-	/* Only opers can change other users modes */
-	if (source != dest)
-		return MODEACTION_DENY;
-
 	if (adding)
 	{
 		if (!dest->IsModeSet(this->GetModeChar()))
@@ -334,7 +337,7 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ
 			return;
 		}
 
-		if ((targetuser == user) || (IS_OPER(user)))
+		if (targetuser == user || user->HasPrivPermission("users/auspex"))
 		{
 			/* Display user's current mode string */
 			user->WriteNumeric(RPL_UMODEIS, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes());
@@ -412,7 +415,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 					continue;
 				}
 
-				if (!IS_OPER(user))
+				if (!user->HasPrivPermission("channels/auspex"))
 				{
 					if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
 					{
@@ -479,7 +482,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 		{
 			type = MODETYPE_USER;
 			mask = MASK_USER;
-			if ((user != targetuser) && (!ServerInstance->ULine(user->server)))
+			if (user != targetuser && IS_LOCAL(user) && !ServerInstance->ULine(user->server))
 			{
 				user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
 				return;
@@ -573,6 +576,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 								else
 								{
 									/* No parameter, continue to the next mode */
+									modehandlers[handler_id]->OnParameterMissing(user, targetuser, targetchannel);
 									continue;
 								}
 
@@ -1006,7 +1010,7 @@ std::string ModeParser::ModeString(User* user, Channel* channel, bool nick_suffi
 		return types;
 }
 
-std::string ModeParser::ChanModes()
+std::string ModeParser::GiveModeList(ModeMasks m)
 {
 	std::string type1;	/* Listmodes EXCEPT those with a prefix */
 	std::string type2;	/* Modes that take a param when adding or removing */
@@ -1018,7 +1022,7 @@ std::string ModeParser::ChanModes()
 		if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
 			continue;
 
-		unsigned char pos = (mode-65) | MASK_CHANNEL;
+		unsigned char pos = (mode-65) | m;
 		 /* One parameter when adding */
 		if (modehandlers[pos])
 		{	
@@ -1157,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->Parser->CallHandler("MODE", parameters, user);
+			ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient, false);
 		}
 	}
 }
@@ -1202,7 +1206,6 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
 		new ModeChannelOp(Instance),
 		new ModeChannelHalfOp(Instance),
 		new ModeChannelVoice(Instance),
-		new ModeUserServerNotice(Instance),
 		new ModeUserWallops(Instance),
 		new ModeUserInvisible(Instance),
 		new ModeUserOperator(Instance),