else
snprintf(reason, sizeof(reason), "$X (channel %s) merged into %s by %s.", channel->name, target->name, user->handle_info->handle);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+ /*global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);*/
+ spamserv_oper_message("%s", reason);
return 1;
}
spamserv_part_channel(channel, partmsg);
spamserv_unregister_channel(cInfo);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, global);
+ spamserv_oper_message(SSMSG_CHANNEL_UNREGISTERED, spamserv->nick, channel->name, user->handle_info->handle);
}
}
if(user->uplink->burst || !(cInfo = get_chanInfo(channel->name)) || !CHECK_JOINFLOOD(cInfo) || !(uInfo = get_userInfo(user->nick)))
return 0;
-
+
+ if(IsOper(user))
+ {
+ return 0;
+ }
if(!CHECK_CHANOPS(cInfo))
{
SPAMSERV_FUNC(cmd_register)
{
struct chanInfo *cInfo;
- char reason[MAXLEN];
if(!channel || !channel->channel_info)
{
spamserv_unregister_channel(cInfo);
- spamserv_oper_message(SSMSG_CHANNEL_UNREGISTERED, channel->name, user->handle_info->handle);
+ spamserv_oper_message(SSMSG_CHANNEL_UNREGISTERED, spamserv->nick, channel->name, user->handle_info->handle);
ss_reply("SSMSG_UNREG_SUCCESS", channel->name);
return 1;
reply("SSMSG_BADWORD_SET_DONE");
}
else if(!strcmp("ACTION",setting)) {
- if (!strcmp("1",value) || !strcmp("KICK",value)) {
- badword->action = BADACTION_KICK;
- reply("SSMSG_BADWORD_SET_DONE");
- } else if (!strcmp("2",value) || !strcmp("BAN",value)) {
- badword->action = BADACTION_BAN;
- reply("SSMSG_BADWORD_SET_DONE");
- } else if (!strcmp("3",value) || !strcmp("KILL",value)) {
- badword->action = BADACTION_KILL;
- reply("SSMSG_BADWORD_SET_DONE");
- } else if (!strcmp("4",value) || !strcmp("GLINE",value)) {
- badword->action = BADACTION_GLINE;
- reply("SSMSG_BADWORD_SET_DONE");
- } else {
- reply("SSMSG_BADWORD_SET_INVALID", setting);
- }
+ if (!strcmp("1",value) || !strcmp("KICK",value)) {
+ badword->action = BADACTION_KICK;
+ reply("SSMSG_BADWORD_SET_DONE");
+ } else if (!strcmp("2",value) || !strcmp("BAN",value)) {
+ badword->action = BADACTION_BAN;
+ reply("SSMSG_BADWORD_SET_DONE");
+ } else if (!strcmp("3",value) || !strcmp("KILL",value)) {
+ if(IsOper(user)) {
+ badword->action = BADACTION_KILL;
+ reply("SSMSG_BADWORD_SET_DONE");
+ } else {
+ reply("SSMSG_NO_ACCESS");
+ }
+ } else if (!strcmp("4",value) || !strcmp("GLINE",value)) {
+ if(IsOper(user)) {
+ badword->action = BADACTION_GLINE;
+ reply("SSMSG_BADWORD_SET_DONE");
+ } else {
+ reply("SSMSG_NO_ACCESS");
+ }
+ } else {
+ reply("SSMSG_BADWORD_SET_INVALID", setting);
+ }
} else {
reply("SSMSG_BADWORD_SETTING_INVALID", setting);
}
if(!spamserv || quit_services || !GetUserMode(channel, spamserv) || !(cInfo = get_chanInfo(channel->name)) || !(uInfo = get_userInfo(user->nick)))
return;
+ if(IsOper(user))
+ {
+ return;
+ }
+
if(!CHECK_CHANOPS(cInfo))
{
struct modeNode *mn = GetUserMode(channel, user);