* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: m_join.c 3494 2007-05-27 13:07:27Z jilles $
*/
#include "stdinc.h"
#include "chmode.h"
static int m_join(struct Client *, struct Client *, int, const char **);
+static int me_svsjoin(struct Client *, struct Client *, int, const char **);
static int ms_join(struct Client *, struct Client *, int, const char **);
static int ms_sjoin(struct Client *, struct Client *, int, const char **);
-static int h_can_create_channel;
-static int h_channel_join;
-
struct Message join_msgtab = {
"JOIN", 0, 0, 0, MFLG_SLOW,
{mg_unreg, {m_join, 2}, {ms_join, 2}, mg_ignore, mg_ignore, {m_join, 2}}
};
+struct Message svsjoin_msgtab = {
+ "SVSJOIN", 0, 0, 0, MFLG_SLOW,
+ {mg_ignore, mg_ignore, mg_ignore, mg_ignore, {me_svsjoin, 3}, mg_ignore}
+};
+
struct Message sjoin_msgtab = {
"SJOIN", 0, 0, 0, MFLG_SLOW,
{mg_unreg, mg_ignore, mg_ignore, {ms_sjoin, 4}, mg_ignore, mg_ignore}
};
-mapi_clist_av1 join_clist[] = { &join_msgtab, &sjoin_msgtab, NULL };
+mapi_clist_av1 join_clist[] = { &join_msgtab, &svsjoin_msgtab, &sjoin_msgtab, NULL };
-mapi_hlist_av1 join_hlist[] = {
- { "can_create_channel", &h_can_create_channel },
- { "channel_join", &h_channel_join },
- { NULL, NULL },
-};
-
-DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3494 $");
-
-static void do_join_0(struct Client *client_p, struct Client *source_p);
-static int check_channel_name_loc(struct Client *source_p, const char *name);
+DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, NULL, NULL, "$Revision: 3494 $");
static void set_final_mode(struct Mode *mode, struct Mode *oldmode);
static void remove_our_modes(struct Channel *chptr, struct Client *source_p);
rb_dlink_list * list, char c, int mems);
static char modebuf[MODEBUFLEN];
+static char omodebuf[MODEBUFLEN];
static char parabuf[MODEBUFLEN];
static const char *para[MAXMODEPARAMS];
-static char *mbuf;
+static char *mbuf, *ombuf;
static int pargs;
-/* Check what we will forward to, without sending any notices to the user
- * -- jilles
- */
-static struct Channel *
-check_forward(struct Client *source_p, struct Channel *chptr,
- char *key)
-{
- int depth = 0, i;
-
- /* User is +Q */
- if (IsNoForward(source_p))
- return NULL;
-
- while (depth < 16)
- {
- chptr = find_channel(chptr->mode.forward);
- /* Can only forward to existing channels */
- if (chptr == NULL)
- return NULL;
- /* Already on there, show original error message */
- if (IsMember(source_p, chptr))
- return NULL;
- /* Juped. Sending a warning notice would be unfair */
- if (hash_find_resv(chptr->chname))
- return NULL;
- /* Don't forward to +Q channel */
- if (chptr->mode.mode & MODE_DISFORWARD)
- return NULL;
- i = can_join(source_p, chptr, key);
- if (i == 0)
- return chptr;
- if (i != ERR_INVITEONLYCHAN && i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_CHANNELISFULL)
- return NULL;
- depth++;
- }
-
- return NULL;
-}
-
/*
* m_join
- * parv[0] = sender prefix
* parv[1] = channel
* parv[2] = channel password (key)
*/
static int
m_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- static char jbuf[BUFSIZE];
- struct Channel *chptr = NULL;
- struct ConfItem *aconf;
- char *name;
- char *key = NULL;
- const char *modes;
- int i, flags = 0;
- char *p = NULL, *p2 = NULL;
- char *chanlist;
- char *mykey;
- int successful_join_count = 0; /* Number of channels successfully joined */
-
- jbuf[0] = '\0';
-
- /* rebuild the list of channels theyre supposed to be joining.
- * this code has a side effect of losing keys, but..
- */
- chanlist = LOCAL_COPY(parv[1]);
- for(name = rb_strtok_r(chanlist, ",", &p); name; name = rb_strtok_r(NULL, ",", &p))
- {
- /* check the length and name of channel is ok */
- if(!check_channel_name_loc(source_p, name) || (strlen(name) > LOC_CHANNELLEN))
- {
- sendto_one_numeric(source_p, ERR_BADCHANNAME,
- form_str(ERR_BADCHANNAME), (unsigned char *) name);
- continue;
- }
-
- /* join 0 parts all channels */
- if(*name == '0' && (name[1] == ',' || name[1] == '\0') && name == chanlist)
- {
- (void) strcpy(jbuf, "0");
- continue;
- }
-
- /* check it begins with # or &, and local chans are disabled */
- else if(!IsChannelName(name))
- {
- sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
- form_str(ERR_NOSUCHCHANNEL), name);
- continue;
- }
-
- /* see if its resv'd */
- if(!IsExemptResv(source_p) && (aconf = hash_find_resv(name)))
- {
- sendto_one_numeric(source_p, ERR_BADCHANNAME,
- form_str(ERR_BADCHANNAME), name);
-
- /* dont warn for opers */
- if(!IsExemptJupe(source_p) && !IsOper(source_p))
- sendto_realops_snomask(SNO_SPY, L_NETWIDE,
- "User %s (%s@%s) is attempting to join locally juped channel %s (%s)",
- source_p->name, source_p->username,
- source_p->orighost, name, aconf->passwd);
- /* dont update tracking for jupe exempt users, these
- * are likely to be spamtrap leaves
- */
- else if(IsExemptJupe(source_p))
- aconf->port--;
-
- continue;
- }
-
- if(splitmode && !IsOper(source_p) && (*name != '&') &&
- ConfigChannel.no_join_on_split)
- {
- sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
- me.name, source_p->name, name);
- continue;
- }
-
- if(*jbuf)
- (void) strcat(jbuf, ",");
- (void) rb_strlcat(jbuf, name, sizeof(jbuf));
- }
-
- if(parc > 2)
- {
- mykey = LOCAL_COPY(parv[2]);
- key = rb_strtok_r(mykey, ",", &p2);
- }
-
- for(name = rb_strtok_r(jbuf, ",", &p); name;
- key = (key) ? rb_strtok_r(NULL, ",", &p2) : NULL, name = rb_strtok_r(NULL, ",", &p))
- {
- hook_data_channel_activity hook_info;
-
- /* JOIN 0 simply parts all channels the user is in */
- if(*name == '0' && !atoi(name))
- {
- if(source_p->user->channel.head == NULL)
- continue;
-
- do_join_0(&me, source_p);
- continue;
- }
+ user_join(client_p, source_p, parv[1], parc > 2 ? parv[2] : NULL); /* channel.c */
- /* look for the channel */
- if((chptr = find_channel(name)) != NULL)
- {
- if(IsMember(source_p, chptr))
- continue;
-
- flags = 0;
- }
- else
- {
- hook_data_client_approval moduledata;
-
- moduledata.client = source_p;
- moduledata.approved = 0;
-
- call_hook(h_can_create_channel, &moduledata);
-
- if(moduledata.approved != 0)
- {
- sendto_one(source_p, form_str(moduledata.approved),
- me.name, source_p->name, name);
- continue;
- }
-
- if(splitmode && !IsOper(source_p) && (*name != '&') &&
- ConfigChannel.no_create_on_split)
- {
- sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
- me.name, source_p->name, name);
- continue;
- }
-
- flags = CHFL_CHANOP;
- }
-
- if((rb_dlink_list_length(&source_p->user->channel) >=
- (unsigned long) ConfigChannel.max_chans_per_user) &&
- (!IsOper(source_p) ||
- (rb_dlink_list_length(&source_p->user->channel) >=
- (unsigned long) ConfigChannel.max_chans_per_user * 3)))
- {
- sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS),
- me.name, source_p->name, name);
- if(successful_join_count)
- source_p->localClient->last_join_time = rb_current_time();
- return 0;
- }
-
- if(flags == 0) /* if channel doesn't exist, don't penalize */
- successful_join_count++;
-
- if(chptr == NULL) /* If I already have a chptr, no point doing this */
- {
- chptr = get_or_create_channel(source_p, name, NULL);
-
- if(chptr == NULL)
- {
- sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
- me.name, source_p->name, name);
- if(successful_join_count > 0)
- successful_join_count--;
- continue;
- }
- }
-
- if(!IsOper(source_p) && !IsExemptSpambot(source_p))
- check_spambot_warning(source_p, name);
-
- /* can_join checks for +i key, bans etc */
- if((i = can_join(source_p, chptr, key)))
- {
- if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) ||
- (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL))
- {
- /* might be wrong, but is there any other better location for such?
- * see extensions/chm_operonly.c for other comments on this
- * -- dwr
- */
- if(i != ERR_CUSTOM)
- sendto_one(source_p, form_str(i), me.name, source_p->name, name);
-
- if(successful_join_count > 0)
- successful_join_count--;
- continue;
- }
-
- sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname);
- }
-
- /* add the user to the channel */
- add_user_to_channel(chptr, source_p, flags);
- if (chptr->mode.join_num &&
- rb_current_time() - chptr->join_delta >= chptr->mode.join_time)
- {
- chptr->join_count = 0;
- chptr->join_delta = rb_current_time();
- }
- chptr->join_count++;
-
- /* we send the user their join here, because we could have to
- * send a mode out next.
- */
- sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
- source_p->name,
- source_p->username, source_p->host, chptr->chname);
-
- /* its a new channel, set +nt and burst. */
- if(flags & CHFL_CHANOP)
- {
- chptr->channelts = rb_current_time();
- chptr->mode.mode |= MODE_TOPICLIMIT;
- chptr->mode.mode |= MODE_NOPRIVMSGS;
- modes = channel_modes(chptr, &me);
-
- sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s",
- me.name, chptr->chname, modes);
-
- if(*chptr->chname == '#')
- {
- sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
- ":%s SJOIN %ld %s %s :@%s",
- me.id, (long) chptr->channelts,
- chptr->chname, modes,
- source_p->id);
- }
- }
- else
- {
- sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
- ":%s JOIN %ld %s +",
- use_id(source_p), (long) chptr->channelts,
- chptr->chname);
- }
-
- del_invite(chptr, source_p);
-
- if(chptr->topic != NULL)
- {
- sendto_one(source_p, form_str(RPL_TOPIC), me.name,
- source_p->name, chptr->chname, chptr->topic);
+ return 0;
+}
- sendto_one(source_p, form_str(RPL_TOPICWHOTIME),
- me.name, source_p->name, chptr->chname,
- chptr->topic_info, chptr->topic_time);
- }
+/*
+ * me_svsjoin - small function to allow services to forcejoin clients, mainly for ns_ajoin
+ * parv[1] = user to act on (join to a channel)
+ * parv[2] = channel
+ * This does allow opers to "forcejoin" users to channels with operserv/raw or by writing a
+ * custom module (where they can make it not log anything), but the former bitches that it's
+ * being used and the latter...Can probably be done anyway with enough hackyness if this
+ * command didn't exist so it's not all that bad.
+ */
+static int
+me_svsjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+{
+ struct Client *target_p;
- channel_member_names(chptr, source_p, 1);
+ if(!(source_p->flags & FLAGS_SERVICE))
+ return 0;
- if(successful_join_count)
- source_p->localClient->last_join_time = rb_current_time();
+ if((target_p = find_person(parv[1])) == NULL)
+ return 0;
- hook_info.client = source_p;
- hook_info.chptr = chptr;
- hook_info.key = key;
- call_hook(h_channel_join, &hook_info);
- }
+ if(!MyClient(target_p))
+ return 0;
+ user_join(&me, target_p, parv[2], NULL);
return 0;
}
/*
* ms_join
- *
- * inputs -
- * output - none
- * side effects - handles remote JOIN's sent by servers. In TSora
- * remote clients are joined using SJOIN, hence a
- * JOIN sent by a server on behalf of a client is an error.
- * here, the initial code is in to take an extra parameter
- * and use it for the TimeStamp on a new channel.
+ * parv[1] = channel TS
+ * parv[2] = channel
+ * parv[3] = "+", formerly channel modes but now unused
+ * alternatively, a single "0" parameter parts all channels
*/
static int
ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
return 0;
mbuf = modebuf;
+ ombuf = omodebuf;
mode.key[0] = mode.forward[0] = '\0';
mode.mode = mode.limit = mode.join_num = mode.join_time = 0;
":%s MODE %s %s %s",
source_p->servptr->name,
chptr->chname, modebuf, parabuf);
- *modebuf = *parabuf = '\0';
+ if(*omodebuf != '\0')
+ sendto_channel_local(ONLY_OPERS, chptr,
+ ":%s MODE %s %s %s",
+ source_p->servptr->name,
+ chptr->chname, modebuf, parabuf);
+ *omodebuf = *modebuf = *parabuf = '\0';
+
+ /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+ set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
}
if(!IsMember(source_p, chptr))
if(*parv[2] == '&')
return 0;
- modebuf[0] = parabuf[0] = mode.key[0] = mode.forward[0] = '\0';
+ omodebuf[0] = modebuf[0] = parabuf[0] = mode.key[0] = mode.forward[0] = '\0';
pargs = mode.mode = mode.limit = mode.join_num = mode.join_time = 0;
/* Hide connecting server on netburst -- jilles */
fakesource_p = source_p;
mbuf = modebuf;
+ ombuf = omodebuf;
newts = atol(parv[1]);
s = parv[3];
{
/* If configured, kick people trying to join +i/+k
* channels by recreating them on split servers.
- * Don't kick if the source has sent EOB (services
- * deopping everyone by TS-1 SJOIN).
+ * If the source has sent EOB, assume this is some
+ * sort of hack by services. If cmode +i is set,
+ * services can send kicks if needed; if the key
+ * differs, services cannot kick in a race-free
+ * manner so do so here.
* -- jilles */
if (ConfigChannel.kick_on_split_riding &&
- !HasSentEob(source_p) &&
- ((mode.mode & MODE_INVITEONLY) ||
+ ((!HasSentEob(source_p) &&
+ mode.mode & MODE_INVITEONLY) ||
(mode.key[0] != 0 && irccmp(mode.key, oldmode->key) != 0)))
{
struct membership *msptr;
/* Update capitalization in channel name, this makes the
* capitalization timestamped like modes are -- jilles */
strcpy(chptr->chname, parv[2]);
+
+ /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+ set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
}
if(*modebuf != '\0')
sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s %s %s",
fakesource_p->name, chptr->chname, modebuf, parabuf);
- *modebuf = *parabuf = '\0';
+ if(*omodebuf != '\0')
+ sendto_channel_local(ONLY_OPERS, chptr, ":%s MODE %s %s %s",
+ fakesource_p->name, chptr->chname, omodebuf, parabuf);
+
+ *omodebuf = *modebuf = *parabuf = '\0';
if(parv[3][0] != '0' && keep_new_modes)
modes = channel_modes(chptr, source_p);
else
modes = empty_modes;
- /* working on the presumption eventually itll be more efficient to
- * build a TS6 buffer without checking its needed..
- */
mlen_uid = rb_sprintf(buf_uid, ":%s SJOIN %ld %s %s :",
use_id(source_p), (long) chptr->channelts, parv[2], modes);
ptr_uid = buf_uid + mlen_uid;
mbuf = modebuf;
+ ombuf = omodebuf;
para[0] = para[1] = para[2] = para[3] = empty;
pargs = 0;
len_nick = len_uid = 0;
{
fl = 0;
- for (i = 0; i < 2; i++)
+ for (i = 0; i < 4; i++)
{
- if(*s == '@')
+ if(*s == '!')
+ {
+ fl |= CHFL_ADMIN;
+ s++;
+ }
+ else if(*s == '@')
{
fl |= CHFL_CHANOP;
s++;
}
+ else if(*s == '%')
+ {
+ fl |= CHFL_HALFOP;
+ s++;
+ }
else if(*s == '+')
{
fl |= CHFL_VOICE;
if(keep_new_modes)
{
+ if(fl & CHFL_ADMIN)
+ {
+ *ptr_uid++ = '!';
+ len_nick++;
+ len_uid++;
+ }
if(fl & CHFL_CHANOP)
{
*ptr_uid++ = '@';
len_nick++;
len_uid++;
}
+ if(fl & CHFL_HALFOP)
+ {
+ *ptr_uid++ = '%';
+ len_nick++;
+ len_uid++;
+ }
if(fl & CHFL_VOICE)
{
*ptr_uid++ = '+';
joins++;
}
- if(fl & CHFL_CHANOP)
+ /* If anyone can think of a way to do this that doesn't make babies cry
+ * I would love to hear it - Taros */
+
+ if(fl & CHFL_ADMIN)
+ {
+ *mbuf++ = 'a';
+ para[pargs++] = target_p->name;
+
+ if(fl & CHFL_CHANOP)
+ {
+ /* its possible the +a has filled up MAXMODEPARAMS, if so, start
+ * a new buffer
+ */
+ if(pargs >= MAXMODEPARAMS)
+ {
+ *mbuf = '\0';
+ sendto_channel_local(ALL_MEMBERS, chptr,
+ ":%s MODE %s %s %s %s %s %s",
+ fakesource_p->name, chptr->chname,
+ modebuf,
+ para[0], para[1], para[2], para[3]);
+ mbuf = modebuf;
+ *mbuf++ = '+';
+ para[0] = para[1] = para[2] = para[3] = NULL;
+ pargs = 0;
+ }
+
+ *mbuf++ = 'o';
+ para[pargs++] = target_p->name;
+ }
+ if(fl & CHFL_HALFOP)
+ {
+ /* its possible the +a has filled up MAXMODEPARAMS, if so, start
+ * a new buffer
+ */
+ if(pargs >= MAXMODEPARAMS)
+ {
+ *mbuf = '\0';
+ sendto_channel_local(ALL_MEMBERS, chptr,
+ ":%s MODE %s %s %s %s %s %s",
+ fakesource_p->name, chptr->chname,
+ modebuf,
+ para[0], para[1], para[2], para[3]);
+ mbuf = modebuf;
+ *mbuf++ = '+';
+ para[0] = para[1] = para[2] = para[3] = NULL;
+ pargs = 0;
+ }
+
+ *mbuf++ = 'h';
+ para[pargs++] = target_p->name;
+ }
+ if(fl & CHFL_VOICE)
+ {
+ /* its possible the +a has filled up MAXMODEPARAMS, if so, start
+ * a new buffer
+ */
+ if(pargs >= MAXMODEPARAMS)
+ {
+ *mbuf = '\0';
+ sendto_channel_local(ALL_MEMBERS, chptr,
+ ":%s MODE %s %s %s %s %s %s",
+ fakesource_p->name, chptr->chname,
+ modebuf,
+ para[0], para[1], para[2], para[3]);
+ mbuf = modebuf;
+ *mbuf++ = '+';
+ para[0] = para[1] = para[2] = para[3] = NULL;
+ pargs = 0;
+ }
+
+ *mbuf++ = 'v';
+ para[pargs++] = target_p->name;
+ }
+ }
+ else if(fl & CHFL_CHANOP)
{
*mbuf++ = 'o';
para[pargs++] = target_p->name;
- /* a +ov user.. bleh */
+ if(fl & CHFL_HALFOP)
+ {
+ /* its possible the +o has filled up MAXMODEPARAMS, if so, start
+ * a new buffer
+ */
+ if(pargs >= MAXMODEPARAMS)
+ {
+ *mbuf = '\0';
+ sendto_channel_local(ALL_MEMBERS, chptr,
+ ":%s MODE %s %s %s %s %s %s",
+ fakesource_p->name, chptr->chname,
+ modebuf,
+ para[0], para[1], para[2], para[3]);
+ mbuf = modebuf;
+ *mbuf++ = '+';
+ para[0] = para[1] = para[2] = para[3] = NULL;
+ pargs = 0;
+ }
+
+ *mbuf++ = 'h';
+ para[pargs++] = target_p->name;
+ }
if(fl & CHFL_VOICE)
{
/* its possible the +o has filled up MAXMODEPARAMS, if so, start
para[pargs++] = target_p->name;
}
}
+ else if(fl & CHFL_HALFOP)
+ {
+ *mbuf++ = 'h';
+ para[pargs++] = target_p->name;
+
+ if(fl & CHFL_VOICE)
+ {
+ /* its possible the +h has filled up MAXMODEPARAMS, if so, start
+ * a new buffer
+ */
+ if(pargs >= MAXMODEPARAMS)
+ {
+ *mbuf = '\0';
+ sendto_channel_local(ALL_MEMBERS, chptr,
+ ":%s MODE %s %s %s %s %s %s",
+ fakesource_p->name, chptr->chname,
+ modebuf,
+ para[0], para[1], para[2], para[3]);
+ mbuf = modebuf;
+ *mbuf++ = '+';
+ para[0] = para[1] = para[2] = para[3] = NULL;
+ pargs = 0;
+ }
+
+ *mbuf++ = 'v';
+ para[pargs++] = target_p->name;
+ }
+ }
else if(fl & CHFL_VOICE)
{
*mbuf++ = 'v';
return 0;
}
-/*
- * do_join_0
- *
- * inputs - pointer to client doing join 0
- * output - NONE
- * side effects - Use has decided to join 0. This is legacy
- * from the days when channels were numbers not names. *sigh*
- * There is a bunch of evilness necessary here due to
- * anti spambot code.
- */
-static void
-do_join_0(struct Client *client_p, struct Client *source_p)
-{
- struct membership *msptr;
- struct Channel *chptr = NULL;
- rb_dlink_node *ptr;
-
- /* Finish the flood grace period... */
- if(MyClient(source_p) && !IsFloodDone(source_p))
- flood_endgrace(source_p);
-
- sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p));
-
- if(source_p->user->channel.head && MyConnect(source_p) &&
- !IsOper(source_p) && !IsExemptSpambot(source_p))
- check_spambot_warning(source_p, NULL);
-
- while((ptr = source_p->user->channel.head))
- {
- msptr = ptr->data;
- chptr = msptr->chptr;
- sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
- source_p->name,
- source_p->username, source_p->host, chptr->chname);
- remove_user_from_channel(msptr);
- }
-}
-
-static int
-check_channel_name_loc(struct Client *source_p, const char *name)
-{
- s_assert(name != NULL);
- if(EmptyString(name))
- return 0;
-
- if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p))
- {
- for(; *name; ++name)
- {
- if(!IsChanChar(*name) || IsFakeChanChar(*name))
- return 0;
- }
- }
- else
- {
- for(; *name; ++name)
- {
- if(!IsChanChar(*name))
- return 0;
- }
- }
-
- return 1;
-}
static void
set_final_mode(struct Mode *mode, struct Mode *oldmode)
{
- int dir = MODE_QUERY;
+ int dir = MODE_QUERY, odir = MODE_QUERY;
char *pbuf = parabuf;
int len;
int i;
{
if((mode->mode & chmode_flags[i]) && !(oldmode->mode & chmode_flags[i]))
{
- if(dir != MODE_ADD)
+ if (chmode_table[i].set_func == chm_hidden)
{
- *mbuf++ = '+';
- dir = MODE_ADD;
+ if(odir != MODE_ADD)
+ {
+ *ombuf++ = '+';
+ odir = MODE_ADD;
+ }
+ *ombuf++ = i;
+ }
+ else
+ {
+ if(dir != MODE_ADD)
+ {
+ *mbuf++ = '+';
+ dir = MODE_ADD;
+ }
+ *mbuf++ = i;
+
}
- *mbuf++ = i;
}
}
{
if((oldmode->mode & chmode_flags[i]) && !(mode->mode & chmode_flags[i]))
{
- if(dir != MODE_DEL)
+ if(chmode_table[i].set_func == chm_hidden)
{
- *mbuf++ = '-';
- dir = MODE_DEL;
+ if(odir != MODE_DEL)
+ {
+ *ombuf++ = '-';
+ odir = MODE_DEL;
+ }
+ *ombuf++ = i;
+ }
+ else
+ {
+ if(dir != MODE_DEL)
+ {
+ *mbuf++ = '-';
+ dir = MODE_DEL;
+ }
+ *mbuf++ = i;
}
- *mbuf++ = i;
}
}
{
msptr = ptr->data;
- if(is_chanop(msptr))
+ /* If anyone can think of a way to do this that doesn't make babies cry
+ * I would love to hear it - Taros */
+
+ if(is_admin(msptr))
+ {
+ msptr->flags &= ~CHFL_ADMIN;
+ lpara[count++] = msptr->client_p->name;
+ *mbuf++ = 'a';
+
+ /* Make sure it fits if +h, +o, or +v are involved */
+ if(is_chanop(msptr))
+ {
+ if(count >= MAXMODEPARAMS)
+ {
+ *mbuf = '\0';
+ sendto_channel_local(ALL_MEMBERS, chptr,
+ ":%s MODE %s %s %s %s %s %s",
+ source_p->name, chptr->chname,
+ lmodebuf, lpara[0], lpara[1],
+ lpara[2], lpara[3]);
+
+ /* preserve the initial '-' */
+ mbuf = lmodebuf;
+ *mbuf++ = '-';
+ count = 0;
+
+ for(i = 0; i < MAXMODEPARAMS; i++)
+ lpara[i] = NULL;
+ }
+
+ msptr->flags &= ~CHFL_CHANOP;
+ lpara[count++] = msptr->client_p->name;
+ *mbuf++ = 'o';
+ }
+ if(is_halfop(msptr))
+ {
+ if(count >= MAXMODEPARAMS)
+ {
+ *mbuf = '\0';
+ sendto_channel_local(ALL_MEMBERS, chptr,
+ ":%s MODE %s %s %s %s %s %s",
+ source_p->name, chptr->chname,
+ lmodebuf, lpara[0], lpara[1],
+ lpara[2], lpara[3]);
+
+ /* preserve the initial '-' */
+ mbuf = lmodebuf;
+ *mbuf++ = '-';
+ count = 0;
+
+ for(i = 0; i < MAXMODEPARAMS; i++)
+ lpara[i] = NULL;
+ }
+
+ msptr->flags &= ~CHFL_HALFOP;
+ lpara[count++] = msptr->client_p->name;
+ *mbuf++ = 'h';
+ }
+ if(is_voiced(msptr))
+ {
+ if(count >= MAXMODEPARAMS)
+ {
+ *mbuf = '\0';
+ sendto_channel_local(ALL_MEMBERS, chptr,
+ ":%s MODE %s %s %s %s %s %s",
+ source_p->name, chptr->chname,
+ lmodebuf, lpara[0], lpara[1],
+ lpara[2], lpara[3]);
+
+ /* preserve the initial '-' */
+ mbuf = lmodebuf;
+ *mbuf++ = '-';
+ count = 0;
+
+ for(i = 0; i < MAXMODEPARAMS; i++)
+ lpara[i] = NULL;
+ }
+
+ msptr->flags &= ~CHFL_VOICE;
+ lpara[count++] = msptr->client_p->name;
+ *mbuf++ = 'v';
+ }
+ }
+ else if(is_chanop(msptr))
{
msptr->flags &= ~CHFL_CHANOP;
lpara[count++] = msptr->client_p->name;
*mbuf++ = 'o';
- /* +ov, might not fit so check. */
+ /* Make sure it fits if +h or +v are involved */
+ if(is_halfop(msptr))
+ {
+ if(count >= MAXMODEPARAMS)
+ {
+ *mbuf = '\0';
+ sendto_channel_local(ALL_MEMBERS, chptr,
+ ":%s MODE %s %s %s %s %s %s",
+ source_p->name, chptr->chname,
+ lmodebuf, lpara[0], lpara[1],
+ lpara[2], lpara[3]);
+
+ /* preserve the initial '-' */
+ mbuf = lmodebuf;
+ *mbuf++ = '-';
+ count = 0;
+
+ for(i = 0; i < MAXMODEPARAMS; i++)
+ lpara[i] = NULL;
+ }
+
+ msptr->flags &= ~CHFL_HALFOP;
+ lpara[count++] = msptr->client_p->name;
+ *mbuf++ = 'h';
+ }
+ if(is_voiced(msptr))
+ {
+ if(count >= MAXMODEPARAMS)
+ {
+ *mbuf = '\0';
+ sendto_channel_local(ALL_MEMBERS, chptr,
+ ":%s MODE %s %s %s %s %s %s",
+ source_p->name, chptr->chname,
+ lmodebuf, lpara[0], lpara[1],
+ lpara[2], lpara[3]);
+
+ /* preserve the initial '-' */
+ mbuf = lmodebuf;
+ *mbuf++ = '-';
+ count = 0;
+
+ for(i = 0; i < MAXMODEPARAMS; i++)
+ lpara[i] = NULL;
+ }
+
+ msptr->flags &= ~CHFL_VOICE;
+ lpara[count++] = msptr->client_p->name;
+ *mbuf++ = 'v';
+ }
+ }
+ else if(is_halfop(msptr))
+ {
+ msptr->flags &= ~CHFL_HALFOP;
+ lpara[count++] = msptr->client_p->name;
+ *mbuf++ = 'h';
+
+ /* +hv, might not fit so check. */
if(is_voiced(msptr))
{
if(count >= MAXMODEPARAMS)
*mbuf = '\0';
sendto_channel_local(ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
- me.name, chptr->chname,
+ source_p->name, chptr->chname,
lmodebuf, lpara[0], lpara[1],
lpara[2], lpara[3]);
*mbuf = '\0';
sendto_channel_local(ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
- me.name, chptr->chname, lmodebuf,
+ source_p->name, chptr->chname, lmodebuf,
lpara[0], lpara[1], lpara[2], lpara[3]);
mbuf = lmodebuf;
*mbuf++ = '-';
*mbuf = '\0';
sendto_channel_local(ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
- me.name, chptr->chname, lmodebuf,
+ source_p->name, chptr->chname, lmodebuf,
EmptyString(lpara[0]) ? "" : lpara[0],
EmptyString(lpara[1]) ? "" : lpara[1],
EmptyString(lpara[2]) ? "" : lpara[2],
projects / irc / rqf / shadowircd.git / blobdiff