Fix mistakenly using Clang instead of GCC on older FreeBSD versions.

[user/henk/code/inspircd.git] / src / commands / cmd_invite.cpp

diff --git a/src/commands/cmd_invite.cpp b/src/commands/cmd_invite.cpp
index 8025296ae8723c33e30edc850191c7b90c4bc2f3..c69e6bd1be19fa2f99bf00d53401edb699fc92a6 100644 (file)
--- a/src/commands/cmd_invite.cpp
+++ b/src/commands/cmd_invite.cpp
@@ -72,16 +72,16 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
                        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));
        }