Forward port /invite changes from 2.10.11.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1052 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 369b4031e944641ebc1864fd1954c559910892d6..24d49293590ce3cf6b5fc7e8b4ac9024e14886fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-05-15  Isomer <isomer@undernet.org>
+
+       [Original ChangeLog date: 2004-03-20 -MDP]
+
+       * ircd/m_invite.c: Disallow invites to non existant channels
+
+2004-05-15  David Mansell <splidge@quakenet.org>
+
+       [Original ChangeLog date: 2003-04-26 -MDP]
+
+       * ircd/m_invite.c: let +k users invite into channels they aren't on.
+
 2004-05-15  hikari <shadow@undernet.org>
 
        [Original ChangeLog date: 2003-07-13 -MDP]

diff --git a/ircd/m_invite.c b/ircd/m_invite.c
index ca5401e0489e09e808a6235ff06e795b3f735579..acb65e6bab86aa84e4f356fc11399363051ee806 100644 (file)
--- a/ircd/m_invite.c
+++ b/ircd/m_invite.c
@@ -146,25 +146,7 @@ int m_invite(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     return 0;
 
   if (!(chptr = FindChannel(parv[2]))) {
-    if (IsLocalChannel(parv[2]))
-    {
-      send_reply(sptr, ERR_NOTONCHANNEL, parv[2]);
-      return 0;
-    }
-
-    /* Do not disallow to invite to non-existant #channels, otherwise they
-       would simply first be created, causing only MORE bandwidth usage. */
-
-    if (check_target_limit(sptr, acptr, cli_name(acptr), 0))
-      return 0;
-
-    send_reply(sptr, RPL_INVITING, cli_name(acptr), parv[2]);
-
-    if (cli_user(acptr)->away)
-      send_reply(sptr, RPL_AWAY, cli_name(acptr), cli_user(acptr)->away);
-
-    sendcmdto_one(sptr, CMD_INVITE, acptr, "%s :%s", cli_name(acptr), parv[2]);
-
+    send_reply(sptr, ERR_NOTONCHANNEL, parv[2]);
     return 0;
   }
 
@@ -237,7 +219,7 @@ int ms_invite(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     protocol_violation(sptr,"Too few arguments to invite");
     return need_more_params(sptr,"INVITE");
   }
-  if ('#' != *parv[2]) {
+  if (!IsGlobalChannel(parv[2])) {
     /*
      * should not be sent
      */
@@ -267,7 +249,7 @@ int ms_invite(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     return 0;
   }
 
-  if (!find_channel_member(sptr, chptr)) {
+  if (!IsChannelService(sptr) && !find_channel_member(sptr, chptr)) {
     send_reply(sptr, ERR_NOTONCHANNEL, chptr->chname);
     return 0;
   }