cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Branch merge

This commit is contained in:
JD Horelick 2010-09-11 13:31:13 -04:00
parent e7c34075dd ea84bfdeff
commit 2d10c55990
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/channel.h
View File

@ -268,9 +268,7 @@ extern void channel_member_names(struct Channel *chptr, struct Client *,
extern void del_invite(struct Channel *chptr, struct Client *who);
const char *channel_modes_real(struct Channel *chptr, struct Mode *mode, struct Client *who);
#define channel_modes(chptr, who) channel_modes_real(chptr, &(chptr)->mode, who)
#define channel_mlock(chptr, who) channel_modes_real(chptr, &(chptr)->mode_lock, who)
const char *channel_modes(struct Channel *chptr, struct Client *who);
extern int has_common_channel(struct Client *client1, struct Client *client2);

25
src/channel.c
View File

@ -1286,10 +1286,9 @@ has_common_channel(struct Client *client1, struct Client *client2)
return 0;
}
/* channel_modes_real()
/* channel_modes()
*
* inputs - pointer to channel
* - pointer to channel mode struct
* - pointer to client
* output - string with simple modes
* side effects - result from previous calls overwritten
@ -1297,7 +1296,7 @@ has_common_channel(struct Client *client1, struct Client *client2)
* Stolen from ShadowIRCd 4 --nenolod
*/
const char *
channel_modes_real(struct Channel *chptr, struct Mode *mode, struct Client *client_p)
channel_modes(struct Channel *chptr, struct Client *client_p)
{
int i;
char buf1[BUFSIZE];
@ -1313,41 +1312,41 @@ channel_modes_real(struct Channel *chptr, struct Mode *mode, struct Client *clie
{
if(chmode_table[i].set_func == chm_hidden && !IsOper(client_p) && IsClient(client_p))
continue;
if(mode->mode & chmode_flags[i])
if(chptr->mode.mode & chmode_flags[i])
*mbuf++ = i;
}
if(mode->limit)
if(chptr->mode.limit)
{
*mbuf++ = 'l';
if(!IsClient(client_p) || IsMember(client_p, chptr))
pbuf += rb_sprintf(pbuf, " %d", mode->limit);
pbuf += rb_sprintf(pbuf, " %d", chptr->mode.limit);
}
if(mode->key)
if(*chptr->mode.key)
{
*mbuf++ = 'k';
if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
pbuf += rb_sprintf(pbuf, " %s", mode->key);
pbuf += rb_sprintf(pbuf, " %s", chptr->mode.key);
}
if(mode->join_num)
if(chptr->mode.join_num)
{
*mbuf++ = 'j';
if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
pbuf += rb_sprintf(pbuf, " %d:%d", mode->join_num,
mode->join_time);
pbuf += rb_sprintf(pbuf, " %d:%d", chptr->mode.join_num,
chptr->mode.join_time);
}
if(mode->forward && (ModuleModes.MODE_FORWARD || !IsClient(client_p)))
if(*chptr->mode.forward && (ModuleModes.MODE_FORWARD || !IsClient(client_p)))
{
*mbuf++ = 'f';
if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
pbuf += rb_sprintf(pbuf, " %s", mode->forward);
pbuf += rb_sprintf(pbuf, " %s", chptr->mode.forward);
}
*mbuf = '\0';