#include "ioset.h"
#include "log.h"
#include "nickserv.h"
+#include "opserv.h"
+#include "chanserv.h"
+#include "spamserv.h"
#include "timeq.h"
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
&& (offchannel_allowed[(unsigned char)pd->text[0]]
|| (GetUserMode(cn, cf->service) && !IsDeaf(cf->service))))
cf->func(pd->user, cn, pd->text+1, cf->service, pd->is_notice);
+ else
+ spamserv_channel_message(cn, pd->user, pd->text);
/* This catches *all* text sent to the channel that the services server sees */
for (x = 0; x < ALLCHANMSG_FUNCS_MAX; x++) {
{
struct part_desc *desc = data;
DelChannelUser(desc->user, cn, desc->text, false);
+ if (IsOper(desc->user))
+ operpart(cn, desc->user);
}
static CMD_FUNC(cmd_part)
res->modes_set = orig->modes_set;
res->modes_clear = orig->modes_clear;
res->new_limit = orig->new_limit;
+ res->new_access = orig->new_access;
+ memcpy(res->new_altchan, orig->new_altchan, sizeof(res->new_altchan));
+ memcpy(res->new_noflood, orig->new_noflood, sizeof(res->new_noflood));
memcpy(res->new_key, orig->new_key, sizeof(res->new_key));
memcpy(res->new_upass, orig->new_upass, sizeof(res->new_upass));
memcpy(res->new_apass, orig->new_apass, sizeof(res->new_apass));
channel->modes = (channel->modes & ~change->modes_clear) | change->modes_set;
if (change->modes_set & MODE_LIMIT)
channel->limit = change->new_limit;
+ if (change->modes_set & MODE_ACCESS)
+ channel->access = change->new_access;
if (change->modes_set & MODE_KEY)
strcpy(channel->key, change->new_key);
+ if (change->modes_set & MODE_ALTCHAN)
+ strcpy(channel->altchan, change->new_altchan);
+ if (change->modes_set & MODE_NOFLOOD)
+ strcpy(channel->noflood, change->new_noflood);
if (change->modes_set & MODE_UPASS)
strcpy(channel->upass, change->new_upass);
if (change->modes_set & MODE_APASS)
base_oplevel = member->oplevel;
else
base_oplevel = MAXOPLEVEL;
- if (!(change = mod_chanmode_parse(channel, modes, argc, flags, base_oplevel)))
+ if (!(change = mod_chanmode_parse(channel, who, modes, argc, flags, base_oplevel)))
return 0;
if (flags & MC_ANNOUNCE)
mod_chanmode_announce(who, channel, change);
mod_chanmode_init(&change);
change.modes_set = chan->modes;
change.new_limit = chan->limit;
+ change.new_access = chan->access;
+ safestrncpy(change.new_altchan, chan->altchan, sizeof(change.new_altchan));
+ safestrncpy(change.new_noflood, chan->noflood, sizeof(change.new_noflood));
safestrncpy(change.new_key, chan->key, sizeof(change.new_key));
safestrncpy(change.new_upass, chan->upass, sizeof(change.new_upass));
safestrncpy(change.new_apass, chan->apass, sizeof(change.new_apass));
}
hostname = user->hostname;
if (IsFakeHost(user) && IsHiddenHost(user) && !(options & GENMASK_NO_HIDING)) {
- hostname = user->fakehost;
+ if(user->fakehost && user->fakehost[0] == '$') {
+ hostname = alloca(strlen(user->handle_info->handle) + strlen(user->fakehost));
+ sprintf(hostname, "%s%s", user->handle_info->handle, user->fakehost+1);
+ } else {
+ hostname = user->fakehost;
+ }
} else if (IsHiddenHost(user) && user->handle_info && hidden_host_suffix && !(options & GENMASK_NO_HIDING)) {
hostname = alloca(strlen(user->handle_info->handle) + strlen(hidden_host_suffix) + 2);
sprintf(hostname, "%s.%s", user->handle_info->handle, hidden_host_suffix);