diff options
Diffstat (limited to 'src')
72 files changed, 112 insertions, 112 deletions
diff --git a/src/channels.c b/src/channels.c index ab5e0b3a8..758af8448 100644 --- a/src/channels.c +++ b/src/channels.c @@ -1149,7 +1149,7 @@ void do_cmode(const char *source, int ac, const char **av) if (!chan) { if (debug) { ci = cs_findchan(av[0]); - if (!(ci && (ci->flags & CI_VERBOTEN))) + if (!(ci && (ci->flags & CI_FORBIDDEN))) alog("debug: MODE %s for nonexistent channel %s", merge_args(ac - 1, av + 1), av[0]); } @@ -1363,7 +1363,7 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes) if (!c || !(ci = c->ci)) return; - if ((ci->flags & CI_VERBOTEN) || (*(c->name) == '+')) + if ((ci->flags & CI_FORBIDDEN) || (*(c->name) == '+')) return; status = chan_get_user_status(c, user); diff --git a/src/chanserv.c b/src/chanserv.c index ee3b96e97..79824a008 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -548,7 +548,7 @@ void load_cs_dbase() ChannelInfo *next; for (ci = chanlists[i]; ci; ci = next) { next = ci->next; - if (!(ci->flags & CI_VERBOTEN) && !ci->founder) { + if (!(ci->flags & CI_FORBIDDEN) && !ci->founder) { alog("%s: database load: Deleting founderless channel %s", s_ChanServ, ci->name); delchan(ci); @@ -883,7 +883,7 @@ int check_valid_admin(User * user, Channel * chan, int servermode) } /* They will be kicked; no need to deop, no need to update our internal struct too */ - if (chan->ci->flags & CI_VERBOTEN) + if (chan->ci->flags & CI_FORBIDDEN) return 0; if (servermode && !check_access(user, chan->ci, CA_AUTOPROTECT)) { @@ -915,7 +915,7 @@ int check_valid_op(User * user, Channel * chan, int servermode) return 1; /* They will be kicked; no need to deop, no need to update our internal struct too */ - if (chan->ci->flags & CI_VERBOTEN) + if (chan->ci->flags & CI_FORBIDDEN) return 0; if (servermode && !check_access(user, chan->ci, CA_AUTOOP)) { @@ -997,7 +997,7 @@ int check_should_op(User * user, char *chan) { ChannelInfo *ci = cs_findchan(chan); - if (!ci || (ci->flags & CI_VERBOTEN) || *chan == '+') + if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+') return 0; if ((ci->flags & CI_SECURE) && !nick_identified(user)) @@ -1020,7 +1020,7 @@ int check_should_voice(User * user, char *chan) { ChannelInfo *ci = cs_findchan(chan); - if (!ci || (ci->flags & CI_VERBOTEN) || *chan == '+') + if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+') return 0; if ((ci->flags & CI_SECURE) && !nick_identified(user)) @@ -1040,7 +1040,7 @@ int check_should_halfop(User * user, char *chan) { ChannelInfo *ci = cs_findchan(chan); - if (!ci || (ci->flags & CI_VERBOTEN) || *chan == '+') + if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+') return 0; if (check_access(user, ci, CA_AUTOHALFOP)) { @@ -1058,7 +1058,7 @@ int check_should_owner(User * user, char *chan) char *tmp; ChannelInfo *ci = cs_findchan(chan); - if (!ci || (ci->flags & CI_VERBOTEN) || *chan == '+') + if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+') return 0; if (((ci->flags & CI_SECUREFOUNDER) && is_real_founder(user, ci)) @@ -1080,7 +1080,7 @@ int check_should_protect(User * user, char *chan) char *tmp; ChannelInfo *ci = cs_findchan(chan); - if (!ci || (ci->flags & CI_VERBOTEN) || *chan == '+') + if (!ci || (ci->flags & CI_FORBIDDEN) || *chan == '+') return 0; if (check_access(user, ci, CA_AUTOPROTECT)) { @@ -1139,7 +1139,7 @@ int check_kick(User * user, const char *chan, time_t chants) if (user->isSuperAdmin == 1) return 0; - if (ci->flags & CI_SUSPENDED || ci->flags & CI_VERBOTEN) + if (ci->flags & CI_SUSPENDED || ci->flags & CI_FORBIDDEN) { get_idealban(ci, user, mask, sizeof(mask)); reason = ci->forbidreason ? ci->forbidreason : getstring(user->na, CHAN_MAY_NOT_BE_USED); @@ -1402,7 +1402,7 @@ void expire_chans() next = ci->next; if (!ci->c && now - ci->last_used >= CSExpire && !(ci-> - flags & (CI_VERBOTEN | CI_NO_EXPIRE | CI_SUSPENDED))) + flags & (CI_FORBIDDEN | CI_NO_EXPIRE | CI_SUSPENDED))) { send_event(EVENT_CHAN_EXPIRE, 1, ci->name); alog("Expiring channel %s (founder: %s)", ci->name, diff --git a/src/core/bs_act.c b/src/core/bs_act.c index f37f2d942..533c7f65a 100644 --- a/src/core/bs_act.c +++ b/src/core/bs_act.c @@ -35,7 +35,7 @@ class CommandBSAct : public Command return MOD_CONT; } - if (ci->flags & CI_VERBOTEN) + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, ci->name); return MOD_CONT; diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index f9927e25d..dc9dca37a 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -55,7 +55,7 @@ class CommandBSAssign : public Command return MOD_CONT; } - if (ci->flags & CI_VERBOTEN) + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index 41050dc93..d51d62517 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -256,7 +256,7 @@ class CommandBSBadwords : public Command return MOD_CONT; } - if (ci->flags & CI_VERBOTEN) + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; diff --git a/src/core/bs_info.c b/src/core/bs_info.c index c6acd204d..917f3e612 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -86,7 +86,7 @@ class CommandBSInfo : public Command notice_lang(s_BotServ, u, PERMISSION_DENIED); return MOD_CONT; } - if (ci->flags & CI_VERBOTEN) { + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, query); return MOD_CONT; } diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c index 8d5688375..49e187fe1 100644 --- a/src/core/bs_kick.c +++ b/src/core/bs_kick.c @@ -42,7 +42,7 @@ class CommandBSKick : public Command syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX); else if (!(ci = cs_findchan(chan))) notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan); - else if (ci->flags & CI_VERBOTEN) + else if (ci->flags & CI_FORBIDDEN) notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan); else if (!is_services_admin(u) && !check_access(u, ci, CA_SET)) notice_lang(s_BotServ, u, ACCESS_DENIED); diff --git a/src/core/bs_say.c b/src/core/bs_say.c index dd995bcc1..2643ff650 100644 --- a/src/core/bs_say.c +++ b/src/core/bs_say.c @@ -37,7 +37,7 @@ class CommandBSSay : public Command return MOD_CONT; } - if (ci->flags & CI_VERBOTEN) + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; diff --git a/src/core/bs_set.c b/src/core/bs_set.c index 9132ed300..73086646d 100644 --- a/src/core/bs_set.c +++ b/src/core/bs_set.c @@ -65,7 +65,7 @@ class CommandBSSet : public Command return MOD_CONT; } else if (!(ci = cs_findchan(chan))) notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan); - else if (ci->flags & CI_VERBOTEN) + else if (ci->flags & CI_FORBIDDEN) notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan); else if (!is_servadmin && !check_access(u, ci, CA_SET)) notice_lang(s_BotServ, u, ACCESS_DENIED); diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c index fd8f487a6..bf66b0073 100644 --- a/src/core/bs_unassign.c +++ b/src/core/bs_unassign.c @@ -34,7 +34,7 @@ class CommandBSUnassign : public Command notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY); else if (!(ci = cs_findchan(chan))) notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan); - else if (ci->flags & CI_VERBOTEN) + else if (ci->flags & CI_FORBIDDEN) notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan); else if (!is_services_admin(u) && !check_access(u, ci, CA_ASSIGN)) notice_lang(s_BotServ, u, ACCESS_DENIED); diff --git a/src/core/cs_access.c b/src/core/cs_access.c index c55bebd84..3adff98d1 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -126,7 +126,7 @@ class CommandCSAccess : public Command syntax_error(s_ChanServ, u, "ACCESS", CHAN_ACCESS_SYNTAX); } else if (!(ci = cs_findchan(chan))) { notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); - } else if (ci->flags & CI_VERBOTEN) { + } else if (ci->flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); /* We still allow LIST in xOP mode, but not others */ } else if ((ci->flags & CI_XOP) && !is_list) { @@ -166,7 +166,7 @@ class CommandCSAccess : public Command notice_lang(s_ChanServ, u, CHAN_ACCESS_NICKS_ONLY); return MOD_CONT; } - if (na->status & NS_VERBOTEN) { + if (na->status & NS_FORBIDDEN) { notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, nick); return MOD_CONT; } @@ -411,7 +411,7 @@ class CommandCSLevels : public Command syntax_error(s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX); } else if (!(ci = cs_findchan(chan))) { notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); - } else if (ci->flags & CI_VERBOTEN) { + } else if (ci->flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); } else if (ci->flags & CI_XOP) { notice_lang(s_ChanServ, u, CHAN_LEVELS_XOP); diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c index 3b43f4692..9eedef49b 100644 --- a/src/core/cs_akick.c +++ b/src/core/cs_akick.c @@ -182,7 +182,7 @@ class CommandCSAKick : public Command syntax_error(s_ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX); } else if (!(ci = cs_findchan(chan))) { notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); - } else if (ci-> flags & CI_VERBOTEN) { + } else if (ci-> flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); } else if (!check_access(u, ci, CA_AKICK) && !is_services_admin(u)) { notice_lang(s_ChanServ, u, ACCESS_DENIED); @@ -207,7 +207,7 @@ class CommandCSAKick : public Command delete [] user; delete [] host; } else { - if (na->status & NS_VERBOTEN) { + if (na->status & NS_FORBIDDEN) { notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, mask); return MOD_CONT; } @@ -253,7 +253,7 @@ class CommandCSAKick : public Command * or higher access. - Viper */ for (i = 0; i < 1024; i++) { for (na2 = nalists[i]; na2; na2 = na2->next) { - if (na2->status & NS_VERBOTEN) + if (na2->status & NS_FORBIDDEN) continue; if (na2->nc && ((na2->nc == ci->founder) || (get_access_nc(na2->nc, ci) diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index 9f4ddd023..c72e45ff8 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -64,7 +64,7 @@ class CommandCSBan : public Command notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); } else if (!(ci = c->ci)) { notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); - } else if (ci->flags & CI_VERBOTEN) { + } else if (ci->flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); } else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) { notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, target); @@ -149,7 +149,7 @@ class CommandCSUnban : public Command return MOD_CONT; } - if (ci->flags & CI_VERBOTEN) + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c index db90da572..e7dfa2972 100644 --- a/src/core/cs_clear.c +++ b/src/core/cs_clear.c @@ -47,7 +47,7 @@ class CommandCSClear : public Command notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); } else if (!(ci = c->ci)) { notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); - } else if (ci->flags & CI_VERBOTEN) { + } else if (ci->flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); } else if (!u || !check_access(u, ci, CA_CLEAR)) { notice_lang(s_ChanServ, u, PERMISSION_DENIED); diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index b44499f0e..84e72a7a8 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -52,7 +52,7 @@ class CommandCSDrop : public Command return MOD_CONT; } - if (!is_servadmin && (ci->flags & CI_VERBOTEN)) + if (!is_servadmin && (ci->flags & CI_FORBIDDEN)) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; @@ -81,7 +81,7 @@ class CommandCSDrop : public Command } } - if (ircd->chansqline && (ci->flags & CI_VERBOTEN)) + if (ircd->chansqline && (ci->flags & CI_FORBIDDEN)) { ircdproto->SendSQLineDel(ci->name); } diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c index 936e98a91..382721434 100644 --- a/src/core/cs_forbid.c +++ b/src/core/cs_forbid.c @@ -80,7 +80,7 @@ class CommandCSForbid : public Command return MOD_CONT; } - ci->flags |= CI_VERBOTEN; + ci->flags |= CI_FORBIDDEN; ci->forbidby = sstrdup(u->nick); if (reason) ci->forbidreason = sstrdup(reason); diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c index 17659df5d..1546002e0 100644 --- a/src/core/cs_getkey.c +++ b/src/core/cs_getkey.c @@ -44,7 +44,7 @@ class CommandCSGetKey : public Command return MOD_CONT; } - if (ci->flags & CI_VERBOTEN) + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c index 1dc6aa5dc..060325c82 100644 --- a/src/core/cs_getpass.c +++ b/src/core/cs_getpass.c @@ -45,7 +45,7 @@ class CommandCSGetPass : public Command notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); return MOD_CONT; } - if (ci->flags & CI_VERBOTEN) + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c index a9bd1926f..f0f1f439a 100644 --- a/src/core/cs_identify.c +++ b/src/core/cs_identify.c @@ -48,7 +48,7 @@ class CommandCSIdentify : public Command return MOD_CONT; } - if (ci->flags & CI_VERBOTEN) + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; diff --git a/src/core/cs_info.c b/src/core/cs_info.c index 8aca84b25..0c3e4303d 100644 --- a/src/core/cs_info.c +++ b/src/core/cs_info.c @@ -63,7 +63,7 @@ class CommandCSInfo : public Command return MOD_CONT; } - if (ci->flags & CI_VERBOTEN) + if (ci->flags & CI_FORBIDDEN) { if (is_oper(u) && ci->forbidby) notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN_OPER, chan, diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c index b50716a0c..986d1d815 100644 --- a/src/core/cs_invite.c +++ b/src/core/cs_invite.c @@ -48,7 +48,7 @@ class CommandCSInvite : public Command notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); return MOD_CONT; } - else if (ci->flags & CI_VERBOTEN) + else if (ci->flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c index c0b5f8b47..9ba68cdcb 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -58,7 +58,7 @@ class CommandCSKick : public Command notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); } else if (!(ci = c->ci)) { notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); - } else if (ci->flags & CI_VERBOTEN) { + } else if (ci->flags & CI_FORBIDDEN) { notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); } else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) { notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, target); diff --git a/src/core/cs_list.c b/src/core/cs_list.c index 505ed8895..0b54f56f2 100644 --- a/src/core/cs_list.c +++ b/src/core/cs_list.c @@ -107,7 +107,7 @@ public: while (keywords.GetToken(keyword)) { if (stricmp(keyword.c_str(), "FORBIDDEN") == 0) - matchflags |= CI_VERBOTEN; + matchflags |= CI_FORBIDDEN; if (stricmp(keyword.c_str(), "SUSPENDED") == 0) matchflags |= CI_SUSPENDED; if (stricmp(keyword.c_str(), "NOEXPIRE") == 0) @@ -126,7 +126,7 @@ public: for (ci = chanlists[i]; ci; ci = ci->next) { if (!is_servadmin && ((ci->flags & CI_PRIVATE) - || (ci->flags & CI_VERBOTEN))) + || (ci->flags & CI_FORBIDDEN))) continue; if ((matchflags != 0) && !(ci->flags & matchflags)) continue; @@ -144,7 +144,7 @@ public: if (is_servadmin && (ci->flags & CI_NO_EXPIRE)) noexpire_char = '!'; - if (ci->flags & CI_VERBOTEN) + if (ci->flags & CI_FORBIDDEN) { snprintf(buf, sizeof(buf), "%-20s [Forbidden]", ci->name); |