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

Fix +g messages not showing to opers.

This commit is contained in:
B.Greenham 2010-03-05 14:39:42 -05:00
parent e6f94b0c3c
commit 1c646b8914
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/core/m_message.c
View File

@ -733,6 +733,7 @@ msg_client(int p_or_n, const char *command,
int do_floodcount = 0; int do_floodcount = 0;
struct Metadata *md; struct Metadata *md;
struct DictionaryIter iter; struct DictionaryIter iter;
int oaccept = 0;
if(MyClient(source_p)) if(MyClient(source_p))
{ {
@ -793,8 +794,19 @@ msg_client(int p_or_n, const char *command,
(IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p)) || (IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p)) ||
(IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0]))) (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])))
{ {
if (IsOper(source_p))
{
DICTIONARY_FOREACH(md, &iter, target_p->user->metadata)
{
if(!strcmp(md->value, source_p->id))
{
oaccept = 1;
break;
}
}
}
/* Here is the anti-flood bot/spambot code -db */ /* Here is the anti-flood bot/spambot code -db */
if(accept_message(source_p, target_p)) if(accept_message(source_p, target_p) || oaccept)
{ {
add_reply_target(target_p, source_p); add_reply_target(target_p, source_p);
sendto_one(target_p, ":%s!%s@%s %s %s :%s", sendto_one(target_p, ":%s!%s@%s %s %s :%s",
@ -802,21 +814,6 @@ msg_client(int p_or_n, const char *command,
source_p->username, source_p->username,
source_p->host, command, target_p->name, text); source_p->host, command, target_p->name, text);
} }
else if (IsOper(source_p))
{
DICTIONARY_FOREACH(md, &iter, target_p->user->metadata)
{
if(!strcmp(md->value, source_p->id))
{
add_reply_target(target_p, source_p);
sendto_one(target_p, ":%s!%s@%s %s %s :%s",
source_p->name,
source_p->username,
source_p->host, command, target_p->name, text);
break;
}
}
}
else if (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0]) else if (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])
{ {
if (p_or_n != NOTICE) if (p_or_n != NOTICE)