From d7d01bdc5c667a1fafd95241282b58e03b4caa5b Mon Sep 17 00:00:00 2001 From: rburchell Date: Mon, 9 Feb 2009 21:01:05 +0000 Subject: Squashed commit: merge next (1.9.1) back to trunk. SVN users, NOTE: THIS WILL NOT BUILD, NOR SHOULD YOU RUN IT YET. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1953 5417fbe8-f217-4b02-8779-1006273d7864 --- src/modules/cs_appendtopic.c | 266 ++++----- src/modules/cs_enforce.c | 778 ++++++++++++------------- src/modules/cs_tban.c | 210 ++++--- src/modules/hs_request.c | 1308 +++++++++++++++++++++--------------------- src/modules/ns_maxemail.c | 166 +++--- src/modules/os_info.c | 955 +++++++++++++++--------------- 6 files changed, 1822 insertions(+), 1861 deletions(-) (limited to 'src/modules') diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c index b84fb0e3e..6aac5a1e1 100644 --- a/src/modules/cs_appendtopic.c +++ b/src/modules/cs_appendtopic.c @@ -48,102 +48,176 @@ #define LNG_CHAN_HELP_APPENDTOPIC 1 #define LNG_APPENDTOPIC_SYNTAX 2 -int my_cs_appendtopic(User * u); -void my_cs_help(User * u); -int my_cs_help_appendtopic(User * u); -void my_add_languages(); +void my_cs_help(User *u); static Module *me; +class CommandCSAppendTopic : public Command +{ + public: + CommandCSAppendTopic() : Command("APPENDTOPIC", 2, 2) + { + } + + CommandResult Execute(User *u, std::vector ¶ms) + { + const char *chan = params[0].c_str(); + const char *newtopic = params[1].c_str(); + char topic[1024]; + Channel *c; + ChannelInfo *ci; + + if (!(c = findchan(chan))) + 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, c->name); + else if (ci->flags & CI_VERBOTEN) + notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); + else if (!is_services_admin(u) && !check_access(u, ci, CA_TOPIC)) + notice_lang(s_ChanServ, u, PERMISSION_DENIED); + else + { + if (ci->last_topic) + { + snprintf(topic, sizeof(topic), "%s %s", ci->last_topic, newtopic); + delete [] ci->last_topic; + } + else + strscpy(topic, newtopic, sizeof(topic)); + + ci->last_topic = *topic ? sstrdup(topic) : NULL; + strscpy(ci->last_topic_setter, u->nick, NICKMAX); + ci->last_topic_time = time(NULL); + + if (c->topic) + delete [] c->topic; + c->topic = *topic ? sstrdup(topic) : NULL; + strscpy(c->topic_setter, u->nick, NICKMAX); + if (ircd->topictsbackward) + c->topic_time = c->topic_time - 1; + else + c->topic_time = ci->last_topic_time; + + if (is_services_admin(u) && !check_access(u, ci, CA_TOPIC)) + alog("%s: %s!%s@%s changed topic of %s as services admin.", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, c->name); + if (ircd->join2set) + { + if (whosends(ci) == findbot(s_ChanServ)) + { + ircdproto->SendJoin(findbot(s_ChanServ), c->name, c->creation_time); + ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ); + } + } + ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic, c->topic_time); + if (ircd->join2set) + { + if (whosends(ci) == findbot(s_ChanServ)) + ircdproto->SendPart(findbot(s_ChanServ), c->name, NULL); + } + } + return MOD_CONT; + } + + bool OnHelp(User *u, const std::string &subcommand) + { + me->NoticeLang(s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX); + ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); + me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_APPENDTOPIC); + + return true; + } + + void OnSyntaxError(User *u) + { + me->NoticeLang(s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX); + } +}; + class CSAppendTopic : public Module { public: CSAppendTopic(const std::string &modname, const std::string &creator) : Module(modname, creator) { - Command *c; - me = this; this->SetAuthor(AUTHOR); this->SetVersion(VERSION); this->SetType(SUPPORTED); - c = createCommand("APPENDTOPIC", my_cs_appendtopic, NULL, -1, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_HEAD); - moduleAddHelp(c, my_cs_help_appendtopic); + this->AddCommand(CHANSERV, new CommandCSAppendTopic(), MOD_HEAD); this->SetChanHelp(my_cs_help); /* English (US) */ const char* langtable_en_us[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Add text to a channels topic", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "This command allows users to append text to a currently set\n" - "channel topic. When TOPICLOCK is on, the topic is updated and\n" - "the new, updated topic is locked.", - /* LNG_APPENDTOPIC_SYNTAX */ - "Syntax: APPENDTOPIC channel text\n" + /* LNG_CHAN_HELP */ + " APPENDTOPIC Add text to a channels topic", + /* LNG_CHAN_HELP_APPENDTOPIC */ + "This command allows users to append text to a currently set\n" + "channel topic. When TOPICLOCK is on, the topic is updated and\n" + "the new, updated topic is locked.", + /* LNG_APPENDTOPIC_SYNTAX */ + "Syntax: APPENDTOPIC channel text\n" }; /* Dutch (NL) */ const char* langtable_nl[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Voeg tekst aan een kanaal onderwerp toe", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "Dit command stelt gebruikers in staat om text toe te voegen\n" - "achter het huidige onderwerp van een kanaal. Als TOPICLOCK aan\n" - "staat, zal het onderwerp worden bijgewerkt en zal het nieuwe,\n" - "bijgewerkte topic worden geforceerd.", - /* LNG_APPENDTOPIC_SYNTAX */ - "Gebruik: APPENDTOPIC kanaal tekst\n" + /* LNG_CHAN_HELP */ + " APPENDTOPIC Voeg tekst aan een kanaal onderwerp toe", + /* LNG_CHAN_HELP_APPENDTOPIC */ + "Dit command stelt gebruikers in staat om text toe te voegen\n" + "achter het huidige onderwerp van een kanaal. Als TOPICLOCK aan\n" + "staat, zal het onderwerp worden bijgewerkt en zal het nieuwe,\n" + "bijgewerkte topic worden geforceerd.", + /* LNG_APPENDTOPIC_SYNTAX */ + "Gebruik: APPENDTOPIC kanaal tekst\n" }; /* German (DE) */ const char* langtable_de[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Fьgt einen Text zu einem Channel-Topic hinzu.", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "Dieser Befehl erlaubt Benutzern, einen Text zu dem vorhandenen Channel-Topic\n" - "hinzuzufьgen. Wenn TOPICLOCK gesetzt ist, wird das Topic aktualisiert\n" - "und das neue, aktualisierte Topic wird gesperrt.", - /* LNG_APPENDTOPIC_SYNTAX */ - "Syntax: APPENDTOPIC Channel Text\n" + /* LNG_CHAN_HELP */ + " APPENDTOPIC Fьgt einen Text zu einem Channel-Topic hinzu.", + /* LNG_CHAN_HELP_APPENDTOPIC */ + "Dieser Befehl erlaubt Benutzern, einen Text zu dem vorhandenen Channel-Topic\n" + "hinzuzufьgen. Wenn TOPICLOCK gesetzt ist, wird das Topic aktualisiert\n" + "und das neue, aktualisierte Topic wird gesperrt.", + /* LNG_APPENDTOPIC_SYNTAX */ + "Syntax: APPENDTOPIC Channel Text\n" }; /* Portuguese (PT) */ const char* langtable_pt[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Adiciona texto ao tуpico de um canal", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "Este comando permite aos usuбrios anexar texto a um tуpico de canal\n" - "jб definido. Quando TOPICLOCK estб ativado, o tуpico й atualizado e\n" - "o novo tуpico й travado.", - /* LNG_APPENDTOPIC_SYNTAX */ - "Sintaxe: APPENDTOPIC canal texto\n" + /* LNG_CHAN_HELP */ + " APPENDTOPIC Adiciona texto ao tуpico de um canal", + /* LNG_CHAN_HELP_APPENDTOPIC */ + "Este comando permite aos usuбrios anexar texto a um tуpico de canal\n" + "jб definido. Quando TOPICLOCK estб ativado, o tуpico й atualizado e\n" + "o novo tуpico й travado.", + /* LNG_APPENDTOPIC_SYNTAX */ + "Sintaxe: APPENDTOPIC canal texto\n" }; /* Russian (RU) */ const char* langtable_ru[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Добавляет текст к топику канала", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "Данная команда позволяет добавить текст к топику, который установлен на указанном\n" - "канале. Если активирован режим TOPICLOCK, топик будет обновлен и заблокирован.\n" - "Примечание: текст будет ДОБАВЛЕН к топику, то есть старый топик удален НЕ БУДЕТ.\n", - /* LNG_APPENDTOPIC_SYNTAX */ - "Синтаксис: APPENDTOPIC #канал текст\n" + /* LNG_CHAN_HELP */ + " APPENDTOPIC Добавляет текст к топику канала", + /* LNG_CHAN_HELP_APPENDTOPIC */ + "Данная команда позволяет добавить текст к топику, который установлен на указанном\n" + "канале. Если активирован режим TOPICLOCK, топик будет обновлен и заблокирован.\n" + "Примечание: текст будет ДОБАВЛЕН к топику, то есть старый топик удален НЕ БУДЕТ.\n", + /* LNG_APPENDTOPIC_SYNTAX */ + "Синтаксис: APPENDTOPIC #канал текст\n" }; /* Italian (IT) */ const char* langtable_it[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Aggiunge del testo al topic di un canale", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "Questo comando permette agli utenti di aggiungere del testo ad un topic di un canale\n" - "giа impostato. Se TOPICLOCK и attivato, il topic viene aggiornato e il nuovo topic\n" - "viene bloccato.", - /* LNG_APPENDTOPIC_SYNTAX */ - "Sintassi: APPENDTOPIC canale testo\n" + /* LNG_CHAN_HELP */ + " APPENDTOPIC Aggiunge del testo al topic di un canale", + /* LNG_CHAN_HELP_APPENDTOPIC */ + "Questo comando permette agli utenti di aggiungere del testo ad un topic di un canale\n" + "giа impostato. Se TOPICLOCK и attivato, il topic viene aggiornato e il nuovo topic\n" + "viene bloccato.", + /* LNG_APPENDTOPIC_SYNTAX */ + "Sintassi: APPENDTOPIC canale testo\n" }; this->InsertLanguage(LANG_EN_US, LNG_NUM_STRINGS, langtable_en_us); @@ -155,83 +229,9 @@ class CSAppendTopic : public Module } }; -void my_cs_help(User * u) +void my_cs_help(User *u) { me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP); } -int my_cs_help_appendtopic(User * u) -{ - me->NoticeLang(s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX); - ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); - me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_APPENDTOPIC); - return MOD_STOP; -} - -int my_cs_appendtopic(User * u) -{ - char *cur_buffer; - char *chan; - char *newtopic; - char topic[1024]; - Channel *c; - ChannelInfo *ci; - - cur_buffer = moduleGetLastBuffer(); - chan = myStrGetToken(cur_buffer, ' ', 0); - newtopic = myStrGetTokenRemainder(cur_buffer, ' ', 1); - - if (!chan || !newtopic) { - me->NoticeLang(s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX); - } else if (!(c = findchan(chan))) { - 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, c->name); - } else if (ci->flags & CI_VERBOTEN) { - notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); - } else if (!is_services_admin(u) && !check_access(u, ci, CA_TOPIC)) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); - } else { - if (ci->last_topic) { - snprintf(topic, sizeof(topic), "%s %s", ci->last_topic, - newtopic); - delete [] ci->last_topic; - } else { - strscpy(topic, newtopic, sizeof(topic)); - } - - ci->last_topic = *topic ? sstrdup(topic) : NULL; - strscpy(ci->last_topic_setter, u->nick, NICKMAX); - ci->last_topic_time = time(NULL); - - if (c->topic) - delete [] c->topic; - c->topic = *topic ? sstrdup(topic) : NULL; - strscpy(c->topic_setter, u->nick, NICKMAX); - if (ircd->topictsbackward) - c->topic_time = c->topic_time - 1; - else - c->topic_time = ci->last_topic_time; - - if (is_services_admin(u) && !check_access(u, ci, CA_TOPIC)) - alog("%s: %s!%s@%s changed topic of %s as services admin.", - s_ChanServ, u->nick, u->username, u->host, c->name); - if (ircd->join2set) { - if (whosends(ci) == findbot(s_ChanServ)) { - ircdproto->SendJoin(findbot(s_ChanServ), c->name, c->creation_time); - ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ); - } - } - ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic, c->topic_time); - if (ircd->join2set) { - if (whosends(ci) == findbot(s_ChanServ)) { - ircdproto->SendPart(findbot(s_ChanServ), c->name, NULL); - } - } - } - if (newtopic) delete [] newtopic; - if (chan) delete [] chan; - return MOD_CONT; -} - MODULE_INIT("cs_appendtopic", CSAppendTopic) diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c index b85787311..19ff90b2b 100644 --- a/src/modules/cs_enforce.c +++ b/src/modules/cs_enforce.c @@ -18,10 +18,7 @@ #define AUTHOR "Anope" #define VERSION "$Id$" -int my_cs_enforce(User * u); -void my_cs_help(User * u); -int my_cs_help_enforce(User * u); -void my_add_languages(); +void my_cs_help(User *u); #define LNG_NUM_STRINGS 6 @@ -34,224 +31,430 @@ void my_add_languages(); static Module *me; +class CommandCSEnforce : public Command +{ + private: + void DoSet(Channel *c) + { + ChannelInfo *ci; + + if (!(ci = c->ci)) + return; + + if (ci->flags & CI_SECUREOPS) + this->DoSecureOps(c); + if (ci->flags & CI_RESTRICTED) + this->DoRestricted(c); + } + + void DoModes(Channel *c) + { + CBMode *cbm; + + if ((cbm = &cbmodes[static_cast('R')])->flag && (c->mode & cbm->flag)) + this->DoCModeR(c); + } + + void DoSecureOps(Channel *c) + { + struct c_userlist *user; + struct c_userlist *next; + ChannelInfo *ci; + uint32 flags; + + if (!(ci = c->ci)) + return; + + if (debug) + alog("debug: cs_enforce: Enforcing SECUREOPS on %s", c->name); + + /* Dirty hack to allow chan_set_correct_modes to work ok. + * We pretend like SECUREOPS is on so it doesn't ignore that + * part of the code. This way we can enforce SECUREOPS even + * if it's off. + */ + flags = ci->flags; + ci->flags |= CI_SECUREOPS; + + user = c->users; + do + { + next = user->next; + chan_set_correct_modes(user->user, c, 0); + user = next; + } while (user); + + ci->flags = flags; + } + + void DoRestricted(Channel *c) + { + struct c_userlist *user; + struct c_userlist *next; + ChannelInfo *ci; + int16 old_nojoin_level; + char mask[BUFSIZE]; + char *reason; + const char *av[3]; + User *u; + + if (!(ci = c->ci)) + return; + + if (debug) + alog("debug: cs_enforce: Enforcing RESTRICTED on %s", c->name); + + old_nojoin_level = ci->levels[CA_NOJOIN]; + if (ci->levels[CA_NOJOIN] < 0) + ci->levels[CA_NOJOIN] = 0; + + user = c->users; + do + { + next = user->next; + u = user->user; + if (check_access(u, c->ci, CA_NOJOIN)) + { + get_idealban(ci, u, mask, sizeof(mask)); + reason = getstring(u->na, CHAN_NOT_ALLOWED_TO_JOIN); + ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask, time(NULL)); + ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s", reason); + av[0] = ci->name; + av[1] = u->nick; + av[2] = reason; + do_kick(s_ChanServ, 3, av); + } + user = next; + } while (user); + + ci->levels[CA_NOJOIN] = old_nojoin_level; + } + + void DoCModeR(Channel *c) + { + struct c_userlist *user; + struct c_userlist *next; + ChannelInfo *ci; + char mask[BUFSIZE]; + char *reason; + const char *av[3]; + User *u; + CBMode *cbm; + + if (!(ci = c->ci)) + return; + + if (debug) + alog("debug: cs_enforce: Enforcing mode +R on %s", c->name); + + user = c->users; + do + { + next = user->next; + u = user->user; + if (!nick_identified(u)) + { + get_idealban(ci, u, mask, sizeof(mask)); + reason = getstring(u->na, CHAN_NOT_ALLOWED_TO_JOIN); + if (!(cbm = &cbmodes[static_cast('R')])->flag || !(c->mode & cbm->flag)) + ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask, time(NULL)); + ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s", reason); + av[0] = ci->name; + av[1] = u->nick; + av[2] = reason; + do_kick(s_ChanServ, 3, av); + } + user = next; + } while (user); + } + public: + CommandCSEnforce() : Command("ENFORCE", 1, 2) + { + } + + CommandResult Execute(User *u, std::vector ¶ms) + { + const char *chan = params[0].c_str(); + const char *what = params.size() > 1 ? params[1].c_str() : NULL; + Channel *c; + ChannelInfo *ci; + + if (!(c = findchan(chan))) + 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) + notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); + else if (!is_services_admin(u) && !check_access(u, ci, CA_AKICK)) + notice_lang(s_ChanServ, u, PERMISSION_DENIED); + else + { + if (!what || !stricmp(what, "SET")) + { + this->DoSet(c); + me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what); + } + else if (!stricmp(what, "MODES")) + { + this->DoModes(c); + me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what); + } + else if (!stricmp(what, "SECUREOPS")) + { + this->DoSecureOps(c); + me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what); + } + else if (!stricmp(what, "RESTRICTED")) + { + this->DoRestricted(c); + me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what); + } + else if (!stricmp(what, "+R")) + { + this->DoCModeR(c); + me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what); + } + else + this->OnSyntaxError(u); + } + + return MOD_CONT; + } + + bool OnHelp(User *u, const std::string &subcommand) + { + me->NoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX); + ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); + me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE); + ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); + if (cbmodes[static_cast('R')].flag) + me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED); + else + me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_DISABLED); + + return true; + } + + void OnSyntaxError(User *u) + { + me->NoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX); + } +}; + class CSEnforce : public Module { public: CSEnforce(const std::string &modname, const std::string &creator) : Module(modname, creator) { - Command *c; - me = this; this->SetAuthor(AUTHOR); this->SetVersion(VERSION); this->SetType(SUPPORTED); - c = createCommand("ENFORCE", my_cs_enforce, NULL, -1, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_HEAD); + this->AddCommand(CHANSERV, new CommandCSEnforce(), MOD_HEAD); - moduleAddHelp(c, my_cs_help_enforce); this->SetChanHelp(my_cs_help); /* English (US) */ const char* langtable_en_us[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Enforce various channel modes and set options", - /* LNG_ENFORCE_SYNTAX */ - "Syntax: \002ENFORCE \037channel\037 [\037what\037]\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Enforce various channel modes and set options. The \037channel\037\n" - "option indicates what channel to enforce the modes and options\n" - "on. The \037what\037 option indicates what modes and options to\n" - "enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n" - "or +R. When left out, it defaults to SET.\n" - " \n" - "If \037what\037 is SET, it will enforce SECUREOPS and RESTRICTED\n" - "on the users currently in the channel, if they are set. Give\n" - "SECUREOPS to enforce the SECUREOPS option, even if it is not\n" - "enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n" - "if it's not enabled.", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "If \037what\037 is MODES, it will enforce channelmode +R if it is\n" - "set. If +R is specified for \037what\037, the +R channelmode will\n" - "also be enforced, but even if it is not set. If it is not set,\n" - "users will be banned to ensure they don't just rejoin.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "If \037what\037 is MODES, nothing will be enforced, since it would\n" - "enforce modes that the current ircd does not support. If +R is\n" - "specified for \037what\037, an equalivant of channelmode +R on\n" - "other ircds will be enforced. All users that are in the channel\n" - "but have not identified for their nickname will be kicked and\n" - "banned from the channel.", - /* LNG_CHAN_RESPONSE */ - "Enforced %s" + /* LNG_CHAN_HELP */ + " ENFORCE Enforce various channel modes and set options", + /* LNG_ENFORCE_SYNTAX */ + "Syntax: \002ENFORCE \037channel\037 [\037what\037]\002", + /* LNG_CHAN_HELP_ENFORCE */ + "Enforce various channel modes and set options. The \037channel\037\n" + "option indicates what channel to enforce the modes and options\n" + "on. The \037what\037 option indicates what modes and options to\n" + "enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n" + "or +R. When left out, it defaults to SET.\n" + " \n" + "If \037what\037 is SET, it will enforce SECUREOPS and RESTRICTED\n" + "on the users currently in the channel, if they are set. Give\n" + "SECUREOPS to enforce the SECUREOPS option, even if it is not\n" + "enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n" + "if it's not enabled.", + /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ + "If \037what\037 is MODES, it will enforce channelmode +R if it is\n" + "set. If +R is specified for \037what\037, the +R channelmode will\n" + "also be enforced, but even if it is not set. If it is not set,\n" + "users will be banned to ensure they don't just rejoin.", + /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ + "If \037what\037 is MODES, nothing will be enforced, since it would\n" + "enforce modes that the current ircd does not support. If +R is\n" + "specified for \037what\037, an equalivant of channelmode +R on\n" + "other ircds will be enforced. All users that are in the channel\n" + "but have not identified for their nickname will be kicked and\n" + "banned from the channel.", + /* LNG_CHAN_RESPONSE */ + "Enforced %s" }; /* Dutch (NL) */ const char* langtable_nl[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Forceer enkele kanaalmodes en set-opties", - /* LNG_ENFORCE_SYNTAX */ - "Syntax: \002ENFORCE \037kanaal\037 [\037wat\037]\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Forceer enkele kannalmodes en set-opties. De \037kanaal\037 optie\n" - "geeft aan op welk kanaal de modes en opties geforceerd moeten\n" - "worden. De \037wat\037 optie geeft aan welke modes en opties\n" - "geforceerd moeten worden; dit kan SET, SECUREOPS, RESTRICTED,\n" - "MODES, of +R zijn. Indien weggelaten is dit standaard SET.\n" - " \n" - "Als er voor \037wat\037 SET wordt ingevuld, zullen SECUREOPS en\n" - "RESTRICTED geforceerd worden op de gebruikers in het kanaal,\n" - "maar alleen als die opties aangezet zijn voor het kanaal. Als\n" - "SECUREOPS of RESTRICTED wordt gegeven voor \037wat\037 zal die optie\n" - "altijd geforceerd worden, ook als die niet is aangezet.", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "Als er voor \037wat\037 MODES wordt ingevuld, zal kanaalmode +R worden\n" - "geforceerd, als die op het kanaal aan staat. Als +R wordt ingevuld,\n" - "zal kanaalmode +R worden geforceerd, maar ook als die niet aan" - "staat voor het kanaal. Als +R niet aan staat, zullen alle ook\n" - "gebanned worden om te zorgen dat ze niet opnieuw het kanaal binnen\n" - "kunnen komen.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "Als er voor \037wat\037 MODES wordt ingevuld, zal er niks gebeuren.\n" - "Normaal gesproken wordt er een kanaalmode geforceerd die op deze\n" - "server niet ondersteund wordt. Als +R wordt ingevuld voor \037wat\037\n" - "zullen alle gebruikers die in het kanaal zitten maar zich niet\n" - "hebben geidentificeerd voor hun nick uit het kanaal gekicked en\n" - "verbannen worden.", - /* LNG_CHAN_RESPONSE */ - "Enforced %s" + /* LNG_CHAN_HELP */ + " ENFORCE Forceer enkele kanaalmodes en set-opties", + /* LNG_ENFORCE_SYNTAX */ + "Syntax: \002ENFORCE \037kanaal\037 [\037wat\037]\002", + /* LNG_CHAN_HELP_ENFORCE */ + "Forceer enkele kannalmodes en set-opties. De \037kanaal\037 optie\n" + "geeft aan op welk kanaal de modes en opties geforceerd moeten\n" + "worden. De \037wat\037 optie geeft aan welke modes en opties\n" + "geforceerd moeten worden; dit kan SET, SECUREOPS, RESTRICTED,\n" + "MODES, of +R zijn. Indien weggelaten is dit standaard SET.\n" + " \n" + "Als er voor \037wat\037 SET wordt ingevuld, zullen SECUREOPS en\n" + "RESTRICTED geforceerd worden op de gebruikers in het kanaal,\n" + "maar alleen als die opties aangezet zijn voor het kanaal. Als\n" + "SECUREOPS of RESTRICTED wordt gegeven voor \037wat\037 zal die optie\n" + "altijd geforceerd worden, ook als die niet is aangezet.", + /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ + "Als er voor \037wat\037 MODES wordt ingevuld, zal kanaalmode +R worden\n" + "geforceerd, als die op het kanaal aan staat. Als +R wordt ingevuld,\n" + "zal kanaalmode +R worden geforceerd, maar ook als die niet aan" + "staat voor het kanaal. Als +R niet aan staat, zullen alle ook\n" + "gebanned worden om te zorgen dat ze niet opnieuw het kanaal binnen\n" + "kunnen komen.", + /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ + "Als er voor \037wat\037 MODES wordt ingevuld, zal er niks gebeuren.\n" + "Normaal gesproken wordt er een kanaalmode geforceerd die op deze\n" + "server niet ondersteund wordt. Als +R wordt ingevuld voor \037wat\037\n" + "zullen alle gebruikers die in het kanaal zitten maar zich niet\n" + "hebben geidentificeerd voor hun nick uit het kanaal gekicked en\n" + "verbannen worden.", + /* LNG_CHAN_RESPONSE */ + "Enforced %s" }; /* German (DE) */ const char* langtable_de[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Erzwingt verschieden Modes und SET Optionen", - /* LNG_ENFORCE_SYNTAX */ - "Syntax: \002ENFORCE \037Channel\037 [\037was\037]\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Erzwingt verschieden Modes und SET Optionen. Die \037Channel\037\n" - "Option zeigt dir den Channel an, indem Modes und Optionen\n" - "zu erzwingen sind. Die \037was\037 Option zeigt dir welche Modes\n" - "und Optionen zu erzwingen sind. Die kцnnen nur SET, SECUREOPS,\n" - "RESTRICTED, MODES oder +R sein.Default ist SET.\n" - " \n" - "Wenn \037was\037 SET ist, wird SECUREOPS und RESTRICTED\n" - "auf die User die z.Z.in Channel sind erzwungen, wenn sie AN sind.\n" - "Benutze SECUREOPS oder RESTRICTED , um die Optionen einzeln\n" - "zu erzwingen, also wenn sie nicht eingeschaltet sind.", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "Wenn \037was\037 MODES ist, wird das ChannelMode +R erzwungen\n" - "falls an. Wenn \037was\037 +R ist, wird +R erzwungen aber eben\n" - "wenn noch nicht als Channel-Mode ist. Wenn +R noch nicht als\n" - "Channel-Mode war werden alle User aus den Channel gebannt um\n" - "sicher zu sein das sie nicht rejoinen.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "Wenn \037was\037 MODES ist, wird nichts erzwungen weil es MODES seine\n" - "kцnnen die dein IRCD nicht unterstьtzt. Wenn \037was\037 +R ist\n" - "oder ein Modes was auf ein anderen IRCD gleich +R ist, wird es\n" - "erzwungen. Alle User die nicht fьr deren Nicknamen identifiziert\n" - "sind werden aus den Channel gekickt und gebannt.", - /* LNG_CHAN_RESPONSE */ - "Erzwungen %s" + /* LNG_CHAN_HELP */ + " ENFORCE Erzwingt verschieden Modes und SET Optionen", + /* LNG_ENFORCE_SYNTAX */ + "Syntax: \002ENFORCE \037Channel\037 [\037was\037]\002", + /* LNG_CHAN_HELP_ENFORCE */ + "Erzwingt verschieden Modes und SET Optionen. Die \037Channel\037\n" + "Option zeigt dir den Channel an, indem Modes und Optionen\n" + "zu erzwingen sind. Die \037was\037 Option zeigt dir welche Modes\n" + "und Optionen zu erzwingen sind. Die kцnnen nur SET, SECUREOPS,\n" + "RESTRICTED, MODES oder +R sein.Default ist SET.\n" + " \n" + "Wenn \037was\037 SET ist, wird SECUREOPS und RESTRICTED\n" + "auf die User die z.Z.in Channel sind erzwungen, wenn sie AN sind.\n" + "Benutze SECUREOPS oder RESTRICTED , um die Optionen einzeln\n" + "zu erzwingen, also wenn sie nicht eingeschaltet sind.", + /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ + "Wenn \037was\037 MODES ist, wird das ChannelMode +R erzwungen\n" + "falls an. Wenn \037was\037 +R ist, wird +R erzwungen aber eben\n" + "wenn noch nicht als Channel-Mode ist. Wenn +R noch nicht als\n" + "Channel-Mode war werden alle User aus den Channel gebannt um\n" + "sicher zu sein das sie nicht rejoinen.", + /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ + "Wenn \037was\037 MODES ist, wird nichts erzwungen weil es MODES seine\n" + "kцnnen die dein IRCD nicht unterstьtzt. Wenn \037was\037 +R ist\n" + "oder ein Modes was auf ein anderen IRCD gleich +R ist, wird es\n" + "erzwungen. Alle User die nicht fьr deren Nicknamen identifiziert\n" + "sind werden aus den Channel gekickt und gebannt.", + /* LNG_CHAN_RESPONSE */ + "Erzwungen %s" }; /* Portuguese (PT) */ const char* langtable_pt[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas", - /* LNG_ENFORCE_SYNTAX */ - "Sintaxe: \002ENFORCE \037canal\037 [\037opзгo\037]\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas.\n" - "O campo \037canal\037 indica qual canal deve ter os modos e opзхes verificadas\n" - "O campo \037opзгo\037 indica quais modos e opзхes devem ser verificadas,\n" - "e pode ser: SET, SECUREOPS, RESTRICTED, MODES ou +R\n" - "Quando deixado em branco, o padrгo й SET.\n" - " \n" - "Se \037opзгo\037 for SET, serгo verificadas as opзхes SECUREOPS e RESTRICTED\n" - "para usuбrios que estiverem no canal, caso elas estejam ativadas. Use\n" - "SECUREOPS para verificar a opзгo SECUREOPS, mesmo que ela nгo esteja ativada\n" - "Use RESTRICTED para verificar a opзгo RESTRICTED, mesmo que ela nгo esteja\n" - "ativada.", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "Se \037opзгo\037 for MODES, serб verificado o modo de canal +R caso ele\n" - "esteja ativado. Se +R for especificado para \037opзгo\037, o modo de canal\n" - "+R tambйm serб verificado, mesmo que ele nгo esteja ativado. Se ele nгo\n" - "estiver ativado, os usuбrios serгo banidos para evitar que reentrem no canal.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "Se \037opзгo\037 for MODES, nada serб verificado, visto que isto poderia\n" - "verificar modos que o IRCd atual nгo suporta. Se +R for especificado\n" - "para \037opзгo\037, um equivalente ao modo de canal +R em outros IRCds\n" - "serб verificado. Todos os usuбrios que estгo no canal, mas nгo estejam\n" - "identificados para seus nicks serгo kickados e banidos do canal.", - /* LNG_CHAN_RESPONSE */ - "Verificado %s" + /* LNG_CHAN_HELP */ + " ENFORCE Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas", + /* LNG_ENFORCE_SYNTAX */ + "Sintaxe: \002ENFORCE \037canal\037 [\037opзгo\037]\002", + /* LNG_CHAN_HELP_ENFORCE */ + "Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas.\n" + "O campo \037canal\037 indica qual canal deve ter os modos e opзхes verificadas\n" + "O campo \037opзгo\037 indica quais modos e opзхes devem ser verificadas,\n" + "e pode ser: SET, SECUREOPS, RESTRICTED, MODES ou +R\n" + "Quando deixado em branco, o padrгo й SET.\n" + " \n" + "Se \037opзгo\037 for SET, serгo verificadas as opзхes SECUREOPS e RESTRICTED\n" + "para usuбrios que estiverem no canal, caso elas estejam ativadas. Use\n" + "SECUREOPS para verificar a opзгo SECUREOPS, mesmo que ela nгo esteja ativada\n" + "Use RESTRICTED para verificar a opзгo RESTRICTED, mesmo que ela nгo esteja\n" + "ativada.", + /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ + "Se \037opзгo\037 for MODES, serб verificado o modo de canal +R caso ele\n" + "esteja ativado. Se +R for especificado para \037opзгo\037, o modo de canal\n" + "+R tambйm serб verificado, mesmo que ele nгo esteja ativado. Se ele nгo\n" + "estiver ativado, os usuбrios serгo banidos para evitar que reentrem no canal.", + /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ + "Se \037opзгo\037 for MODES, nada serб verificado, visto que isto poderia\n" + "verificar modos que o IRCd atual nгo suporta. Se +R for especificado\n" + "para \037opзгo\037, um equivalente ao modo de canal +R em outros IRCds\n" + "serб verificado. Todos os usuбrios que estгo no canal, mas nгo estejam\n" + "identificados para seus nicks serгo kickados e banidos do canal.", + /* LNG_CHAN_RESPONSE */ + "Verificado %s" }; /* Russian (RU) */ const char* langtable_ru[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Перепроверка и установка различных режимов и опций канала", - /* LNG_ENFORCE_SYNTAX */ - "Синтаксис: \002ENFORCE \037#канал\037 \037параметр\037\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Перепроверка и установка различных режимов и опций канала.\n" - "\037Параметр\037 указывает какие опции или режимы канала должны быть\n" - "перепроверены. В качестве параметра могут быть указаны: SET, SECUREOPS,\n" - "RESTRICTED, MODES, или +R. Если параметр не указан, по-умолчанию будет SET.\n" - " \n" - "Если в качестве \037параметра\037 указано SET, будут перепроверены опции\n" - "SECUREOPS и RESTRICTED относительно пользователей на указанном канале\n" - "(при условии, что опции включены). Отдельно указанный параметр SECUREOPS\n" - "применит опцию SECUREOPS (даже если она \037НЕ\037 установлена). Параметр\n" - "RESTRICTED применит опцию RESTRICTED (даже если она \037НЕ\037 установлена)", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "Если в качестве \037параметра\037 указано MODES, будет перепроверен режим +R\n" - "(если он установлен). Отдельно указанный параметр \037+R\037 применит\n" - "канальный режим +R, даже если он не установлен, и забанит всех пользователей,\n" - "которые не идентифицировались к своему нику или не имеют зарегистрированного ника.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "Если в качестве \037параметра\037 указано MODES, перепроверка осуществлена\n" - "НЕ БУДЕТ, так как текущий IRCD не поддерживает необходимые режимы.\n" - "Отдельно указанный параметр \037+R\037 применит канальный режим, эквивалентный\n" - "режиму +R и забанит всех пользователей, которые не идентифицировались к своему\n" - "нику или не имеют зарегистрированного ника.", - /* LNG_CHAN_RESPONSE */ - "Перепроверено: %s" + /* LNG_CHAN_HELP */ + " ENFORCE Перепроверка и установка различных режимов и опций канала", + /* LNG_ENFORCE_SYNTAX */ + "Синтаксис: \002ENFORCE \037#канал\037 \037параметр\037\002", + /* LNG_CHAN_HELP_ENFORCE */ + "Перепроверка и установка различных режимов и опций канала.\n" + "\037Параметр\037 указывает какие опции или режимы канала должны быть\n" + "перепроверены. В качестве параметра могут быть указаны: SET, SECUREOPS,\n" + "RESTRICTED, MODES, или +R. Если параметр не указан, по-умолчанию будет SET.\n" + " \n" + "Если в качестве \037параметра\037 указано SET, будут перепроверены опции\n" + "SECUREOPS и RESTRICTED относительно пользователей на указанном канале\n" + "(при условии, что опции включены). Отдельно указанный параметр SECUREOPS\n" + "применит опцию SECUREOPS (даже если она \037НЕ\037 установлена). Параметр\n" + "RESTRICTED применит опцию RESTRICTED (даже если она \037НЕ\037 установлена)", + /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ + "Если в качестве \037параметра\037 указано MODES, будет перепроверен режим +R\n" + "(если он установлен). Отдельно указанный параметр \037+R\037 применит\n" + "канальный режим +R, даже если он не установлен, и забанит всех пользователей,\n" + "которые не идентифицировались к своему нику или не имеют зарегистрированного ника.", + /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ + "Если в качестве \037параметра\037 указано MODES, перепроверка осуществлена\n" + "НЕ БУДЕТ, так как текущий IRCD не поддерживает необходимые режимы.\n" + "Отдельно указанный параметр \037+R\037 применит канальный режим, эквивалентный\n" + "режиму +R и забанит всех пользователей, которые не идентифицировались к своему\n" + "нику или не имеют зарегистрированного ника.", + /* LNG_CHAN_RESPONSE */ + "Перепроверено: %s" }; /* Italian (IT) */ const char* langtable_it[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Forza diversi modi di canale ed opzioni SET", - /* LNG_ENFORCE_SYNTAX */ - "Sintassi: \002ENFORCE \037canale\037 [\037cosa\037]\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Forza diversi modi di canale ed opzioni SET. Il parametro \037canale\037\n" - "indica il canale sul quale forzare i modi e le opzioni. Il parametro\n" - "\037cosa\037 indica i modi e le opzioni da forzare, e possono essere\n" - "qualsiasi delle opzioni SET, SECUREOPS, RESTRICTED, MODES, o +R.\n" - "Se non specificato, viene sottointeso SET.\n" - " \n" - "Se \037cosa\037 и SET, forzerа SECUREOPS e RESTRICTED sugli utenti\n" - "attualmente nel canale, se sono impostati. Specifica SECUREOPS per\n" - "forzare l'opzione SECUREOPS, anche se non и attivata. Specifica\n" - "RESTRICTED per forzare l'opzione RESTRICTED, anche se non и\n" - "attivata.", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "Se \037cosa\037 и MODES, forzerа il modo del canale +R se и impostato.\n" - "Se +R и specificato per \037cosa\037, il modo del canale +R verrа\n" - "forzato, anche se non и impostato. Se non и impostato, gli utenti\n" - "verranno bannati per assicurare che non rientrino semplicemente.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "Se \037cosa\037 и MODES, niente verrа forzato, siccome forzerebbe\n" - "dei modi che l'ircd in uso non supporterebbe. Se +R и specificato\n" - "per \037cosa\037, un modo equivalente a +R sui altri ircd verrа\n" - "forzato. Tutti gli utenti presenti nel canale ma non identificati\n" - "per il loro nickname verranno bannati ed espulsi dal canale.\n", - /* LNG_CHAN_RESPONSE */ - "Forzato %s" + /* LNG_CHAN_HELP */ + " ENFORCE Forza diversi modi di canale ed opzioni SET", + /* LNG_ENFORCE_SYNTAX */ + "Sintassi: \002ENFORCE \037canale\037 [\037cosa\037]\002", + /* LNG_CHAN_HELP_ENFORCE */ + "Forza diversi modi di canale ed opzioni SET. Il parametro \037canale\037\n" + "indica il canale sul quale forzare i modi e le opzioni. Il parametro\n" + "\037cosa\037 indica i modi e le opzioni da forzare, e possono essere\n" + "qualsiasi delle opzioni SET, SECUREOPS, RESTRICTED, MODES, o +R.\n" + "Se non specificato, viene sottointeso SET.\n" + " \n" + "Se \037cosa\037 и SET, forzerа SECUREOPS e RESTRICTED sugli utenti\n" + "attualmente nel canale, se sono impostati. Specifica SECUREOPS per\n" + "forzare l'opzione SECUREOPS, anche se non и attivata. Specifica\n" + "RESTRICTED per forzare l'opzione RESTRICTED, anche se non и\n" + "attivata.", + /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ + "Se \037cosa\037 и MODES, forzerа il modo del canale +R se и impostato.\n" + "Se +R и specificato per \037cosa\037, il modo del canale +R verrа\n" + "forzato, anche se non и impostato. Se non и impostato, gli utenti\n" + "verranno bannati per assicurare che non rientrino semplicemente.", + /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ + "Se \037cosa\037 и MODES, niente verrа forzato, siccome forzerebbe\n" + "dei modi che l'ircd in uso non supporterebbe. Se +R и specificato\n" + "per \037cosa\037, un modo equivalente a +R sui altri ircd verrа\n" + "forzato. Tutti gli utenti presenti nel canale ma non identificati\n" + "per il loro nickname verranno bannati ed espulsi dal canale.\n", + /* LNG_CHAN_RESPONSE */ + "Forzato %s" }; this->InsertLanguage(LANG_EN_US, LNG_NUM_STRINGS, langtable_en_us); @@ -263,211 +466,10 @@ class CSEnforce : public Module } }; - - -/* Enforcing functions */ -void do_enforce_secureops(Channel * c) -{ - struct c_userlist *user; - struct c_userlist *next; - ChannelInfo *ci; - uint32 flags; - - if (!(ci = c->ci)) - return; - - if (debug) - alog("debug: cs_enforce: Enforcing SECUREOPS on %s", c->name); - - /* Dirty hack to allow chan_set_correct_modes to work ok. - * We pretend like SECUREOPS is on so it doesn't ignore that - * part of the code. This way we can enforce SECUREOPS even - * if it's off. - */ - flags = ci->flags; - ci->flags |= CI_SECUREOPS; - - user = c->users; - do { - next = user->next; - chan_set_correct_modes(user->user, c, 0); - user = next; - } while (user); - - ci->flags = flags; -} - -void do_enforce_restricted(Channel * c) -{ - struct c_userlist *user; - struct c_userlist *next; - ChannelInfo *ci; - int16 old_nojoin_level; - char mask[BUFSIZE]; - char *reason; - const char *av[3]; - User *u; - - if (!(ci = c->ci)) - return; - - if (debug) - alog("debug: cs_enforce: Enforcing RESTRICTED on %s", c->name); - - old_nojoin_level = ci->levels[CA_NOJOIN]; - if (ci->levels[CA_NOJOIN] < 0) - ci->levels[CA_NOJOIN] = 0; - - user = c->users; - do { - next = user->next; - u = user->user; - if (check_access(u, c->ci, CA_NOJOIN)) { - get_idealban(ci, u, mask, sizeof(mask)); - reason = getstring(u->na, CHAN_NOT_ALLOWED_TO_JOIN); - ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask, - time(NULL)); - ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s", reason); - av[0] = ci->name; - av[1] = u->nick; - av[2] = reason; - do_kick(s_ChanServ, 3, av); - } - user = next; - } while (user); - - ci->levels[CA_NOJOIN] = old_nojoin_level; -} - -void do_enforce_cmode_R(Channel * c) -{ - struct c_userlist *user; - struct c_userlist *next; - ChannelInfo *ci; - char mask[BUFSIZE]; - char *reason; - const char *av[3]; - User *u; - CBMode *cbm; - - if (!(ci = c->ci)) - return; - - if (debug) - alog("debug: cs_enforce: Enforcing mode +R on %s", c->name); - - user = c->users; - do { - next = user->next; - u = user->user; - if (!nick_identified(u)) { - get_idealban(ci, u, mask, sizeof(mask)); - reason = getstring(u->na, CHAN_NOT_ALLOWED_TO_JOIN); - if (((cbm = &cbmodes[static_cast('R')])->flag == 0) - || !(c->mode & cbm->flag)) - ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask, - time(NULL)); - ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s", reason); - av[0] = ci->name; - av[1] = u->nick; - av[2] = reason; - do_kick(s_ChanServ, 3, av); - } - user = next; - } while (user); -} - -/* Enforcing Group Functions */ -void do_enforce_set(Channel * c) -{ - ChannelInfo *ci; - - if (!(ci = c->ci)) - return; - - if (ci->flags & CI_SECUREOPS) - do_enforce_secureops(c); - if (ci->flags & CI_RESTRICTED) - do_enforce_restricted(c); -} - -void do_enforce_modes(Channel * c) -{ - CBMode *cbm; - - if (((cbm = &cbmodes[static_cast('R')])->flag != 0) && (c->mode & cbm->flag)) - do_enforce_cmode_R(c); -} - -/* End of enforcing functions */ - -int my_cs_enforce(User * u) -{ - char *cur_buffer; - char *chan=NULL; - char *what=NULL; - Channel *c; - ChannelInfo *ci; - - cur_buffer = moduleGetLastBuffer(); - chan = myStrGetToken(cur_buffer, ' ', 0); - - if (!chan) { - me->NoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX); - } else if (!(c = findchan(chan))) { - 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) { - notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); - } else if (!is_services_admin(u) && !check_access(u, ci, CA_AKICK)) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); - } else { - what = myStrGetToken(cur_buffer, ' ', 1); - if (!what || (stricmp(what, "SET") == 0)) { - do_enforce_set(c); - me->NoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); - } else if (stricmp(what, "MODES") == 0) { - do_enforce_modes(c); - me->NoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); - } else if (stricmp(what, "SECUREOPS") == 0) { - do_enforce_secureops(c); - me->NoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); - } else if (stricmp(what, "RESTRICTED") == 0) { - do_enforce_restricted(c); - me->NoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); - } else if (stricmp(what, "+R") == 0) { - do_enforce_cmode_R(c); - me->NoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); - } else { - me->NoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX); - } - } - - if(chan) delete [] chan; - if(what) delete [] what; - - return MOD_CONT; -} - /* Language and response stuff */ -void my_cs_help(User * u) +void my_cs_help(User *u) { me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP); } -int my_cs_help_enforce(User * u) -{ - me->NoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX); - ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); - me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE); - ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); - if (cbmodes[static_cast('R')].flag != 0) - me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED); - else - me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_DISABLED); - - return MOD_STOP; -} - MODULE_INIT("cs_enforce", CSEnforce) diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c index 2432a0d92..4b7994bfc 100644 --- a/src/modules/cs_tban.c +++ b/src/modules/cs_tban.c @@ -21,15 +21,12 @@ #define AUTHOR "Rob" #define VERSION "$Id$" -void myHelp(User * u); -void myFullHelpSyntax(User * u); -int myFullHelp(User * u); -void mySendResponse(User * u, char *channel, char *mask, char *time); +void myHelp(User *u); +void mySendResponse(User *u, char *channel, char *mask, char *time); -int do_tban(User * u); -void addBan(Channel * c, time_t timeout, char *banmask); +void addBan(Channel *c, time_t timeout, char *banmask); int delBan(int argc, char **argv); -int canBanUser(Channel * c, User * u, User * u2); +int canBanUser(Channel *c, User *u, User *u2); void mAddLanguages(); @@ -41,72 +38,117 @@ static Module *me = NULL; #define TBAN_HELP_DETAIL 2 #define TBAN_RESPONSE 3 +class CommandCSTBan : public Command +{ + public: + CommandCSTBan() : Command("TBAN", 3, 3) + { + } + + CommandResult Execute(User *u, std::vector ¶ms) + { + char mask[BUFSIZE]; + Channel *c; + User *u2 = NULL; + + char *chan = params[0].c_str(); + char *nick = params[1].c_str(); + char *time = params[2].c_str(); + + if (!(c = findchan(chan))) + notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + else if (!(u2 = finduser(nick))) + notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick); + else + { + if (canBanUser(c, u, u2)) + { + get_idealban(c->ci, u2, mask, sizeof(mask)); + addBan(c, dotime(time), mask); + mySendResponse(u, chan, mask, time); + } + } + + return MOD_CONT; + } + + bool OnHelp(User *u, const std::string &subcommand) + { + this->OnSyntaxError(u); + ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); + me->NoticeLang(s_ChanServ, u, TBAN_HELP_DETAIL); + + return true; + } + + void OnSyntaxError(User *u) + { + me->NoticeLang(s_ChanServ, u, TBAN_SYNTAX); + } +}; + class CSTBan : public Module { public: CSTBan(const std::string &modname, const std::string &creator) : Module(modname, creator) { - Command *c; - me = this; this->SetChanHelp(myHelp); - c = createCommand("TBAN", do_tban, NULL, -1, -1, -1, -1, -1); - moduleAddHelp(c, myFullHelp); - this->AddCommand(CHANSERV, c, MOD_HEAD); + this->AddCommand(CHANSERV, new CommandCSTBan(), MOD_HEAD); this->SetAuthor(AUTHOR); this->SetVersion(VERSION); this->SetType(SUPPORTED); const char* langtable_en_us[] = { - " TBAN Bans the user for a given length of time", - "Syntax: TBAN channel nick time", - "Bans the given user from a channel for a specified length of\n" - "time. If the ban is removed before by hand, it will NOT be replaced.", - "%s banned from %s, will auto-expire in %s" + " TBAN Bans the user for a given length of time", + "Syntax: TBAN channel nick time", + "Bans the given user from a channel for a specified length of\n" + "time. If the ban is removed before by hand, it will NOT be replaced.", + "%s banned from %s, will auto-expire in %s" }; const char* langtable_nl[] = { - " TBAN Verban een gebruiker voor een bepaalde tijd", - "Syntax: TBAN kanaal nick tijd", - "Verbant de gegeven gebruiken van het gegeven kanaal voor de\n" - "gegeven tijdsduur. Als de verbanning eerder wordt verwijderd,\n" - "zal deze NIET worden vervangen.", - "%s verbannen van %s, zal verlopen in %s" + " TBAN Verban een gebruiker voor een bepaalde tijd", + "Syntax: TBAN kanaal nick tijd", + "Verbant de gegeven gebruiken van het gegeven kanaal voor de\n" + "gegeven tijdsduur. Als de verbanning eerder wordt verwijderd,\n" + "zal deze NIET worden vervangen.", + "%s verbannen van %s, zal verlopen in %s" }; const char* langtable_de[] = { - " TBAN Bant ein User fьr eine bestimmte Zeit aus ein Channel", - "Syntax: TBAN Channel Nickname Zeit", - "Bant ein User fьr eine bestimmte Zeit aus ein Channel\n" - "Wenn der Ban manuell entfernt wird, wird es NICHT ersetzt.", - "%s gebannt von %s, wird auto-auslaufen in %s" + " TBAN Bant ein User fьr eine bestimmte Zeit aus ein Channel", + "Syntax: TBAN Channel Nickname Zeit", + "Bant ein User fьr eine bestimmte Zeit aus ein Channel\n" + "Wenn der Ban manuell entfernt wird, wird es NICHT ersetzt.", + "%s gebannt von %s, wird auto-auslaufen in %s" }; const char* langtable_pt[] = { - " TBAN Bane o usuбrio por um determinado perнodo de tempo", - "Sintaxe: TBAN canal nick tempo", - "Bane de um canal o usuбrio especificado por um determinado perнodo de\n" - "tempo. Se o ban for removido manualmente antes do tempo, ele nгo serб recolocado.", - "%s foi banido do %s, irб auto-expirar em %s" + " TBAN Bane o usuбrio por um determinado perнodo de tempo", + "Sintaxe: TBAN canal nick tempo", + "Bane de um canal o usuбrio especificado por um determinado perнodo de\n" + "tempo. Se o ban for removido manualmente antes do tempo, ele nгo serб recolocado.", + "%s foi banido do %s, irб auto-expirar em %s" }; const char* langtable_ru[] = { - " TBAN Банит пользователя на указанный промежуток времени", - "Синтаксис: TBAN #канал ник время", - "Банит пользователя на указанный промежуток времени в секундах\n" - "Примечание: удаленный вручную (до своего истечения) бан НЕ БУДЕТ\n" - "переустановлен сервисами автоматически!", - "Установленный бан %s на канале %s истечет через %s секунд" + " TBAN Банит пользователя на указанный промежуток времени", + "Синтаксис: TBAN #канал ник время", + "Банит пользователя на указанный промежуток времени в секундах\n" + "Примечание: удаленный вручную (до своего истечения) бан НЕ БУДЕТ\n" + "переустановлен сервисами автоматически!", + "Установленный бан %s на канале %s истечет через %s секунд" }; const char* langtable_it[] = { - " TBAN Banna l'utente per un periodo di tempo specificato", - "Sintassi: TBAN canale nick tempo", - "Banna l'utente specificato da un canale per un periodo di tempo\n" - "specificato. Se il ban viene rimosso a mano prima della scadenza, NON verrа rimpiazzato.", - "%s bannato da %s, scadrа automaticamente tra %s" + " TBAN Banna l'utente per un periodo di tempo specificato", + "Sintassi: TBAN canale nick tempo", + "Banna l'utente specificato da un canale per un periodo di tempo\n" + "specificato. Se il ban viene rimosso a mano prima della scadenza, NON verrа rimpiazzato.", + "%s bannato da %s, scadrа automaticamente tra %s" }; this->InsertLanguage(LANG_EN_US, LANG_NUM_STRINGS, langtable_en_us); @@ -118,73 +160,17 @@ class CSTBan : public Module } }; - - -void myHelp(User * u) +void myHelp(User *u) { me->NoticeLang(s_ChanServ, u, TBAN_HELP); } -void myFullHelpSyntax(User * u) -{ - me->NoticeLang(s_ChanServ, u, TBAN_SYNTAX); -} - -int myFullHelp(User * u) -{ - myFullHelpSyntax(u); - ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); - me->NoticeLang(s_ChanServ, u, TBAN_HELP_DETAIL); - return MOD_CONT; -} - -void mySendResponse(User * u, char *channel, char *mask, char *time) +void mySendResponse(User *u, char *channel, char *mask, char *time) { me->NoticeLang(s_ChanServ, u, TBAN_RESPONSE, mask, channel, time); } -int do_tban(User * u) -{ - char mask[BUFSIZE]; - Channel *c; - User *u2 = NULL; - - char *buffer = moduleGetLastBuffer(); - char *chan; - char *nick; - char *time; - - chan = myStrGetToken(buffer, ' ', 0); - nick = myStrGetToken(buffer, ' ', 1); - time = myStrGetToken(buffer, ' ', 2); - - if (time && chan && nick) { - - if (!(c = findchan(chan))) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); - } else if (!(u2 = finduser(nick))) { - notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick); - } else { - if (canBanUser(c, u, u2)) { - get_idealban(c->ci, u2, mask, sizeof(mask)); - addBan(c, dotime(time), mask); - mySendResponse(u, chan, mask, time); - } - } - } else { - myFullHelpSyntax(u); - } - if (time) - delete [] time; - if (nick) - delete [] nick; - if (chan) - delete [] chan; - - return MOD_CONT; -} - -void addBan(Channel * c, time_t timeout, char *banmask) +void addBan(Channel *c, time_t timeout, char *banmask) { const char *av[3]; char *cb[2]; @@ -209,7 +195,8 @@ int delBan(int argc, char **argv) av[0] = "-b"; av[1] = argv[1]; - if ((c = findchan(argv[0])) && c->ci) { + if ((c = findchan(argv[0])) && c->ci) + { ircdproto->SendMode(whosends(c->ci), c->name, "-b %s", av[1]); chan_set_modes(s_ChanServ, c, 2, av, 1); } @@ -221,23 +208,20 @@ int canBanUser(Channel * c, User * u, User * u2) { ChannelInfo *ci; int ok = 0; - if (!(ci = c->ci)) { + if (!(ci = c->ci)) notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name); - } else if (ci->flags & CI_VERBOTEN) { + else if (ci->flags & CI_VERBOTEN) notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, c->name); - } else if (!check_access(u, ci, CA_BAN)) { + else if (!check_access(u, ci, CA_BAN)) notice_lang(s_ChanServ, u, ACCESS_DENIED); - } else if (ircd->except && is_excepted(ci, u2)) { + else if (ircd->except && is_excepted(ci, u2)) notice_lang(s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name); - } else if (ircd->protectedumode && is_protected(u2)) { + else if (ircd->protectedumode && is_protected(u2)) notice_lang(s_ChanServ, u, PERMISSION_DENIED); - } else { + else ok = 1; - } return ok; } - - MODULE_INIT("cs_tban", CSTBan) diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c index 838d11564..a1471705a 100644 --- a/src/modules/hs_request.c +++ b/src/modules/hs_request.c @@ -53,25 +53,12 @@ char *HSRequestDBName = NULL; #define LNG_WAITING_SYNTAX 19 #define LNG_HELP_WAITING 20 -int hs_do_request(User * u); -int hs_do_activate(User * u); -int hs_do_reject(User * u); -int hs_do_list_out(User * u); - -int hs_help_request(User * u); -int hs_help_activate(User * u); -int hs_help_reject(User * u); -int hs_help_waiting(User * u); -void hs_help(User * u); - -void my_add_host_request(char *nick, char *vIdent, char *vhost, - char *creator, int32 tmp_time); +void hs_help(User *u); + +void my_add_host_request(char *nick, char *vIdent, char *vhost, char *creator, int32 tmp_time); int my_isvalidchar(const char c); -void my_memo_lang(User * u, char *name, int z, int number, ...); -void req_send_memos(User * u, char *vHost); -void show_list(User * u); -int hs_do_waiting(User * u); -int ns_do_drop(User * u); +void my_memo_lang(User *u, char *name, int z, int number, ...); +void req_send_memos(User *u, char *vHost); void hsreq_save_db(); void hsreq_load_db(); @@ -85,37 +72,377 @@ HostCore *hs_request_head; static Module *me; -class HSRequest : public Module +class CommandHSRequest : public Command { public: - HSRequest(const std::string &modname, const std::string &creator) : Module(modname, creator) + CommandHSRequest() : Command("REQUEST", 1, 1) { - Command *c; - EvtHook *hook; + } - me = this; + CommandResult Execute(User *u, std::vector ¶ms) + { + char *nick; + const char *rawhostmask = params[1].c_str(); + char hostmask[HOSTMAX]; + NickAlias *na; + int32 tmp_time; + char *s; + char *vIdent = NULL; + time_t now = time(NULL); + + nick = u->nick; + + vIdent = myStrGetOnlyToken(rawhostmask, '@', 0); /* Get the first substring, @ as delimiter */ + if (vIdent) + { + rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */ + if (!rawhostmask) + { + me->NoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); + delete [] vIdent; + return MOD_CONT; + } + if (strlen(vIdent) > USERMAX - 1) + { + notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX); + delete [] vIdent; + delete [] rawhostmask; + return MOD_CONT; + } + else + { + for (s = vIdent; *s; ++s) + { + if (!my_isvalidchar(*s)) + { + notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR); + delete [] vIdent; + delete [] rawhostmask; + return MOD_CONT; + } + } + } + if (!ircd->vident) + { + notice_lang(s_HostServ, u, HOST_NO_VIDENT); + delete [] vIdent; + delete [] rawhostmask; + return MOD_CONT; + } + } + if (strlen(rawhostmask) < HOSTMAX - 1) + snprintf(hostmask, HOSTMAX, "%s", rawhostmask); + else + { + notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX); + if (vIdent) + { + delete [] vIdent; + delete [] rawhostmask; + } + return MOD_CONT; + } + + if (!isValidHost(hostmask, 3)) + { + notice_lang(s_HostServ, u, HOST_SET_ERROR); + if (vIdent) + { + delete [] vIdent; + delete [] rawhostmask; + } + return MOD_CONT; + } + + tmp_time = time(NULL); + if ((na = findnick(nick))) + { + if (HSRequestMemoOper || HSRequestMemoSetters) + { + if (MSSendDelay > 0 && u && u->lastmemosend + MSSendDelay > now) + { + me->NoticeLang(s_HostServ, u, LNG_REQUEST_WAIT, MSSendDelay); + u->lastmemosend = now; + if (vIdent) + { + delete [] vIdent; + delete [] rawhostmask; + } + return MOD_CONT; + } + } + my_add_host_request(nick, vIdent, hostmask, u->nick, tmp_time); + + me->NoticeLang(s_HostServ, u, LNG_REQUESTED); + req_send_memos(u, hostmask); + alog("New vHost Requested by %s", nick); + } + else + notice_lang(s_HostServ, u, HOST_NOREG, nick); + + if (vIdent) + { + delete [] vIdent; + delete [] rawhostmask; + } + + return MOD_CONT; + } + + bool OnHelp(User *u, const std::string &subcommand) + { + me->NoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); + ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); + me->NoticeLang(s_HostServ, u, LNG_HELP_REQUEST); + + return true; + } + + void OnSyntaxError(User *u) + { + me->NoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); + } +}; + +class CommandHSActivate : public Command +{ + public: + CommandHSActivate() : Command("ACTIVATE", 1, 1) + { + } + + CommandResult Execute(User *u, std::vector ¶ms) + { + const char *nick = params[0].c_str(); + NickAlias *na; + HostCore *tmp, *hc; + bool found = false; + + if ((na = findnick(nick))) + { + tmp = findHostCore(hs_request_head, nick, &found); + if (found) + { + if (!tmp) + hc = hs_request_head; + else + hc = tmp->next; + + addHostCore(hc->nick, hc->vIdent, hc->vHost, u->nick, time(NULL)); + + if (HSRequestMemoUser) + my_memo_lang(u, hc->nick, 2, LNG_ACTIVATE_MEMO); + + hs_request_head = deleteHostCore(hs_request_head, tmp); + me->NoticeLang(s_HostServ, u, LNG_ACTIVATED, nick); + alog("Host Request for %s activated by %s", nick, u->nick); + } + else + me->NoticeLang(s_HostServ, u, LNG_NO_REQUEST, nick); + } + else + notice_lang(s_HostServ, u, NICK_X_NOT_REGISTERED, nick); + + return MOD_CONT; + } + + bool OnHelp(User *u, const std::string &subcommand) + { + if (!is_host_setter(u)) + return false; + + me->NoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX); + ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); + me->NoticeLang(s_HostServ, u, LNG_HELP_ACTIVATE); + if (HSRequestMemoUser) + me->NoticeLang(s_HostServ, u, LNG_HELP_ACTIVATE_MEMO); + + return true; + } + + void OnSyntaxError(User *u) + { + me->NoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX); + } +}; + +class CommandHSReject : public Command +{ + public: + CommandHSReject() : Command("REJECT", 1, 2) + { + } + + CommandResult Execute(User *u, std::vector ¶ms) + { + const char *nick = params[0].c_str(); + const char *reason = params.size() > 1 ? params[1].c_str() : NULL; + HostCore *tmp, *hc; + bool found = false; + + tmp = findHostCore(hs_request_head, nick, &found); + if (found) + { + if (!tmp) + hc = hs_request_head; + else + hc = tmp->next; + + if (HSRequestMemoUser) + { + if (reason) + my_memo_lang(u, hc->nick, 2, LNG_REJECT_MEMO_REASON, reason); + else + my_memo_lang(u, hc->nick, 2, LNG_REJECT_MEMO); + } + + hs_request_head = deleteHostCore(hs_request_head, tmp); + me->NoticeLang(s_HostServ, u, LNG_REJECTED, nick); + alog("Host Request for %s rejected by %s (%s)", nick, u->nick, reason ? reason : ""); + } + else + me->NoticeLang(s_HostServ, u, LNG_NO_REQUEST, nick); + + return MOD_CONT; + } + + bool OnHelp(User *u, const std::string &subcommand) + { + if (!is_host_setter(u)) + return false; + + me->NoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX); + ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); + me->NoticeLang(s_HostServ, u, LNG_HELP_REJECT); + if (HSRequestMemoUser) + me->NoticeLang(s_HostServ, u, LNG_HELP_REJECT_MEMO); - c = createCommand("request", hs_do_request, nick_identified, -1, -1, -1, -1, -1); - moduleAddHelp(c, hs_help_request); - this->AddCommand(HOSTSERV, c, MOD_HEAD); + return true; + } - c = createCommand("activate", hs_do_activate, is_host_setter, -1, -1, -1, -1, -1); - moduleAddHelp(c, hs_help_activate); - this->AddCommand(HOSTSERV, c, MOD_HEAD); + void OnSyntaxError(User *u) + { + me->NoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX); + } +}; - c = createCommand("reject", hs_do_reject, is_host_setter, -1, -1, -1, -1, -1); - moduleAddHelp(c, hs_help_reject); - this->AddCommand(HOSTSERV, c, MOD_HEAD); +class CommandHSList : public Command +{ + private: + CommandResult DoList(User *u, std::vector ¶ms) + { + struct tm *tm; + char buf[BUFSIZE]; + int counter = 1; + int from = 0, to = 0; + int display_counter = 0; + HostCore *current; + + current = hs_request_head; + while (current) + { + if (((counter >= from && counter <= to) || (!from && !to)) && display_counter < NSListMax) + { + ++display_counter; + tm = localtime(¤t->time); + strftime(buf, sizeof(buf), getstring(NULL, STRFTIME_DATE_TIME_FORMAT), tm); + if (current->vIdent) + notice_lang(s_HostServ, u, HOST_IDENT_ENTRY, counter, current->nick, current->vIdent, current->vHost, current->creator, buf); + else + notice_lang(s_HostServ, u, HOST_ENTRY, counter, current->nick, current->vHost, current->creator, buf); + } + ++counter; + current = current->next; + } + notice_lang(s_HostServ, u, HOST_LIST_FOOTER, display_counter); - c = createCommand("waiting", hs_do_waiting, is_host_setter, -1, -1, -1, -1, -1); - moduleAddHelp(c, hs_help_waiting); - this->AddCommand(HOSTSERV, c, MOD_HEAD); + return MOD_CONT; + } + public: + CommandHSList() : Command("LIST", 1, 1) + { + } - c = createCommand("list", hs_do_list_out, is_services_oper, -1, -1, -1, -1, -1); - this->AddCommand(HOSTSERV, c, MOD_HEAD); + CommandResult Execute(User *u, std::vector ¶ms) + { + const char *key = params[0].c_str(); - c = createCommand("drop", ns_do_drop, NULL, -1, -1, -1, -1, -1); - this->AddCommand(NICKSERV, c, MOD_HEAD); + if (stricmp(key, "+req")) + return MOD_CONT; + + return this->DoList(u, params); + } + + void OnSyntaxError(User *u) + { + // no-op + } +}; + +class CommandHSWaiting : public CommandHSList +{ + public: + CommandHSWaiting() : Command("WAITING", 0, 0) + { + } + + CommandResult Execute(User *u, std::vector ¶ms) + { + return this->DoList(u, params); + } + + bool OnHelp(User *u, const std::string &subcommand) + { + if (!is_host_setter(u)) + return false; + + me->NoticeLang(s_HostServ, u, LNG_WAITING_SYNTAX); + ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); + me->NoticeLang(s_HostServ, u, LNG_HELP_WAITING); + + return true; + } +}; + +class CommandNSDrop : public Command +{ + public: + CommandNSDrop() : Command("DROP", 0, 0) + { + } + + CommandResult Execute(User *u, std::vector ¶ms) + { + HostCore *tmp; + bool found = false; + NickAlias *na; + + na = findnick(u->nick); + tmp = findHostCore(hs_request_head, u->nick, &found); + + if (found && na) + hs_request_head = deleteHostCore(hs_request_head, tmp); + + return MOD_CONT; + } +}; + +class HSRequest : public Module +{ + public: + HSRequest(const std::string &modname, const std::string &creator) : Module(modname, creator) + { + EvtHook *hook; + + me = this; + + this->AddCommand(HOSTSERV, new CommandHSRequest(), MOD_HEAD); + this->AddCommand(HOSTSERV, new CommandHSActivate(), MOD_HEAD); + this->AddCommand(HOSTSERV, new CommandHSReject(), MOD_HEAD); + this->AddCommand(HOSTSERV, new CommandHSWaiting(), MOD_HEAD); + this->AddCommand(HOSTSERV, new