philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify conditionals in check_prot()

Browse Source
This commit is contained in:
Kevin Easton
2017-10-20 16:12:14 +11:00
parent bac141898b
commit 60b40cf332
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/userlist.c
View File

@@ -1199,9 +1199,6 @@ char *ban;
return nicklist; return nicklist;
} }
/* /*
* Protection levels * Protection levels
* 1 Reop if de-oped * 1 Reop if de-oped
@@ -1211,11 +1208,12 @@ char *ban;
*/ */
int check_prot(char *from, char *person, ChannelList *chan, BanList *thisban, NickList *n) int check_prot(char *from, char *person, ChannelList *chan, BanList *thisban, NickList *n)
{ {
NickList *tmp = NULL; NickList *tmp = NULL;
NickList *kicker; NickList *kicker;
char *tmp_ban = NULL; char *tmp_ban = NULL;
char *nick = NULL, *userhost = NULL, *p; char *nick = NULL;
char *userhost = NULL;
char *p;
if (!from || !*from || !person || !*person || !chan) if (!from || !*from || !person || !*person || !chan)
return 0; return 0;
@@ -1255,7 +1253,7 @@ char *nick = NULL, *userhost = NULL, *p;
user = n->userlist; user = n->userlist;
else else
user = tmp->userlist; user = tmp->userlist;
if (!user || (user && !check_channel_match(user->channels, chan->channel))) if (!user || !check_channel_match(user->channels, chan->channel))
return 0; return 0;
if (!(kicker = find_nicklist_in_channellist(from, chan, 0))) if (!(kicker = find_nicklist_in_channellist(from, chan, 0)))
return 0; return 0;
@@ -1266,8 +1264,7 @@ char *nick = NULL, *userhost = NULL, *p;
{ {
if (!kicker->sent_deop) if (!kicker->sent_deop)
{ {
if (!kicker->userlist || if (!kicker->userlist || !(kicker->userlist->flags & PROT_DEOP))
(kicker->userlist && !(kicker->userlist->flags & PROT_DEOP)))
send_to_server("MODE %s -o %s", chan->channel, from); send_to_server("MODE %s -o %s", chan->channel, from);
kicker->sent_deop++; kicker->sent_deop++;
} }
@@ -1303,26 +1300,20 @@ char *nick = NULL, *userhost = NULL, *p;
} }
if (user->flags & PROT_KICK) if (user->flags & PROT_KICK)
{ {
if (kicker && (!kicker->userlist || (kicker->userlist && !(kicker->userlist->flags & PROT_KICK)))) if (!kicker->userlist || !(kicker->userlist->flags & PROT_KICK))
send_to_server("KICK %s %s :\002BitchX\002 Protected User", chan->channel, kicker->nick); send_to_server("KICK %s %s :\002BitchX\002 Protected User", chan->channel, kicker->nick);
} }
if ((user->flags & PROT_REOP) || do_reop) if ((user->flags & PROT_REOP) || do_reop)
{ {
/* added by Sergs serg@gamma.niimm.spb.su */ /* added by Sergs serg@gamma.niimm.spb.su */
if (thisban) if (thisban)
{ {
if (thisban->sent_unban_time - current > 30) if ((thisban->sent_unban_time - current > 30) || (thisban->sent_unban < 3))
{ {
thisban->sent_unban++; thisban->sent_unban++;
thisban->sent_unban_time = current; thisban->sent_unban_time = current;
send_to_server("MODE %s -b %s", chan->channel, thisban->ban); send_to_server("MODE %s -b %s", chan->channel, thisban->ban);
} }
else if (thisban->sent_unban < 3)
{
thisban->sent_unban++;
thisban->sent_unban_time = current;
send_to_server("MODE %s -b %s", chan->channel, thisban->ban);
}
} }
if (n && (!n->sent_reop || (n->sent_reop_time && (current - n->sent_reop_time > 60)))) if (n && (!n->sent_reop || (n->sent_reop_time && (current - n->sent_reop_time > 60))))
{ {
@@ -1492,7 +1483,7 @@ int flag;
return; return;
#ifdef WANT_USERLIST #ifdef WANT_USERLIST
if ( !userptr || (userptr && !check_channel_match(userptr->channels, channel->channel)) || if (!userptr || !check_channel_match(userptr->channels, channel->channel) ||
(shitptr && check_channel_match(shitptr->channels, channel->channel))) (shitptr && check_channel_match(shitptr->channels, channel->channel)))
#endif #endif
{ {