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

diff --git a/src/mode.cpp b/src/mode.cpp
index c3946af2e..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
@@ -174,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()))
@@ -341,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());
@@ -419,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))
 					{
@@ -486,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;
@@ -1014,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 */
@@ -1026,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])
 		{	
@@ -1165,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);
 		}
 	}
 }