X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_invite.cpp;h=c69e6bd1be19fa2f99bf00d53401edb699fc92a6;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=3baa9cb038c8e7b77a16d507ad628a776ae3e0a9;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_invite.cpp b/src/commands/cmd_invite.cpp
index 3baa9cb03..c69e6bd1b 100644
--- a/src/commands/cmd_invite.cpp
+++ b/src/commands/cmd_invite.cpp
@@ -66,22 +66,22 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 				timeout = ConvToInt(parameters[2]);
 		}
 
-		if ((!c) || (!u))
+		if ((!c) || (!u) || (u->registered != REG_ALL))
 		{
 			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), c ? parameters[0].c_str() : parameters[1].c_str());
 			return CMD_FAILURE;
 		}
 
-		if (c->HasUser(u))
-	 	{
-	 		user->WriteNumeric(ERR_USERONCHANNEL, "%s %s %s :is already on channel",user->nick.c_str(),u->nick.c_str(),c->name.c_str());
-	 		return CMD_FAILURE;
-		}
-
 		if ((IS_LOCAL(user)) && (!c->HasUser(user)))
-	 	{
+		{
 			user->WriteNumeric(ERR_NOTONCHANNEL, "%s %s :You're not on that channel!",user->nick.c_str(), c->name.c_str());
-	  		return CMD_FAILURE;
+			return CMD_FAILURE;
+		}
+
+		if (c->HasUser(u))
+		{
+			user->WriteNumeric(ERR_USERONCHANNEL, "%s %s %s :is already on channel",user->nick.c_str(),u->nick.c_str(),c->name.c_str());
+			return CMD_FAILURE;
 		}
 
 		FIRST_MOD_RESULT(OnUserPreInvite, MOD_RESULT, (user,u,c,timeout));
@@ -94,11 +94,13 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 		{
 			if (IS_LOCAL(user))
 			{
-				int rank = c->GetPrefixValue(user);
+				unsigned int rank = c->GetPrefixValue(user);
 				if (rank < HALFOP_VALUE)
 				{
+					// Check whether halfop mode is available and phrase error message accordingly
+					ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
 					user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",
-						user->nick.c_str(), c->name.c_str(), rank >= HALFOP_VALUE ? "" : "half-");
+						user->nick.c_str(), c->name.c_str(), (mh && mh->name == "halfop" ? "half-" : ""));
 					return CMD_FAILURE;
 				}
 			}
@@ -108,23 +110,29 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 			IS_LOCAL(u)->InviteTo(c->name.c_str(), timeout);
 		u->WriteFrom(user,"INVITE %s :%s",u->nick.c_str(),c->name.c_str());
 		user->WriteNumeric(RPL_INVITING, "%s %s %s",user->nick.c_str(),u->nick.c_str(),c->name.c_str());
-		switch (ServerInstance->Config->AnnounceInvites)
+		if (ServerInstance->Config->AnnounceInvites != ServerConfig::INVITE_ANNOUNCE_NONE)
 		{
-			case ServerConfig::INVITE_ANNOUNCE_ALL:
-				c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
-			break;
-			case ServerConfig::INVITE_ANNOUNCE_OPS:
-				c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
-			break;
-			case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
-				if (c->IsModeSet('i'))
-					c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
-				else
-					c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
-			break;
-			default:
-				/* Nobody */
-			break;
+			char prefix;
+			switch (ServerInstance->Config->AnnounceInvites)
+			{
+				case ServerConfig::INVITE_ANNOUNCE_OPS:
+				{
+					prefix = '@';
+					break;
+				}
+				case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
+				{
+					ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
+					prefix = (mh && mh->name == "halfop" ? mh->GetPrefix() : '@');
+					break;
+				}
+				default:
+				{
+					prefix = 0;
+					break;
+				}
+			}
+			c->WriteAllExceptSender(user, true, prefix, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
 		}
 		FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c,timeout));
 	}
@@ -132,10 +140,10 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 	{
 		// pinched from ircu - invite with not enough parameters shows channels
 		// youve been invited to but haven't joined yet.
-		InvitedList* il = IS_LOCAL(user)->GetInviteList();
-		for (InvitedList::iterator i = il->begin(); i != il->end(); i++)
+		InviteList& il = IS_LOCAL(user)->GetInviteList();
+		for (InviteList::const_iterator i = il.begin(); i != il.end(); ++i)
 		{
-			user->WriteNumeric(RPL_INVITELIST, "%s :%s",user->nick.c_str(),i->first.c_str());
+			user->WriteNumeric(RPL_INVITELIST, "%s :%s",user->nick.c_str(), (*i)->chan->name.c_str());
 		}
 		user->WriteNumeric(RPL_ENDOFINVITELIST, "%s :End of INVITE list",user->nick.c_str());
 	}