From 6c55e0a529c7f1216ff6f63a4fc77ea06a2a3a38 Mon Sep 17 00:00:00 2001 From: rburchell Date: Fri, 14 Nov 2008 20:57:20 +0000 Subject: Insane commit of doom: s/ \t/g git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1681 5417fbe8-f217-4b02-8779-1006273d7864 --- src/modules/bs_fantasy_unban.c | 40 +- src/modules/cs_enforce.c | 358 ++++----- src/modules/cs_tban.c | 180 ++--- src/modules/demos/catserv/catserv_messages.c | 10 +- src/modules/demos/catserv/ircd_catserv.c | 112 +-- src/modules/demos/catserv/purr.c | 4 +- src/modules/demos/events.c | 46 +- src/modules/demos/hs_conf.c | 52 +- src/modules/demos/hs_moo.c | 54 +- src/modules/hs_request.c | 1000 +++++++++++++------------- src/modules/ns_maxemail.c | 110 +-- src/modules/ns_noop_convert.c | 110 +-- src/modules/os_ignore_db.c | 62 +- src/modules/os_info.c | 624 ++++++++-------- 14 files changed, 1381 insertions(+), 1381 deletions(-) (limited to 'src/modules') diff --git a/src/modules/bs_fantasy_unban.c b/src/modules/bs_fantasy_unban.c index b7ce00ebf..88920176a 100644 --- a/src/modules/bs_fantasy_unban.c +++ b/src/modules/bs_fantasy_unban.c @@ -41,31 +41,31 @@ class BSFantasyUnban : public Module **/ int do_fantasy(int argc, char **argv) { - User *u; - ChannelInfo *ci; - char *target = NULL; + User *u; + ChannelInfo *ci; + char *target = NULL; - if (argc < 3) - return MOD_CONT; + if (argc < 3) + return MOD_CONT; - if (stricmp(argv[0], "unban") == 0) { - u = finduser(argv[1]); - ci = cs_findchan(argv[2]); - if (!u || !ci || !check_access(u, ci, CA_UNBAN)) - return MOD_CONT; + if (stricmp(argv[0], "unban") == 0) { + u = finduser(argv[1]); + ci = cs_findchan(argv[2]); + if (!u || !ci || !check_access(u, ci, CA_UNBAN)) + return MOD_CONT; - if (argc >= 4) - target = myStrGetToken(argv[3], ' ', 0); - if (!target) - common_unban(ci, u->nick); - else - common_unban(ci, target); + if (argc >= 4) + target = myStrGetToken(argv[3], ' ', 0); + if (!target) + common_unban(ci, u->nick); + else + common_unban(ci, target); - /* free target if needed (#852) */ - Anope_Free(target); - } + /* free target if needed (#852) */ + Anope_Free(target); + } - return MOD_CONT; + return MOD_CONT; } MODULE_INIT("bs_fantasy_unban", BSFantasyUnban) diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c index 31dd089d0..7d66bcb1a 100644 --- a/src/modules/cs_enforce.c +++ b/src/modules/cs_enforce.c @@ -1,5 +1,5 @@ /* cs_enforce - Add a /cs ENFORCE command to enforce various set - * options and channelmodes on a channel. + * options and channelmodes on a channel. * * (C) 2003-2008 Anope Team * Contact us at info@anope.org @@ -23,14 +23,14 @@ void my_cs_help(User * u); int my_cs_help_enforce(User * u); void my_add_languages(void); -#define LNG_NUM_STRINGS 6 +#define LNG_NUM_STRINGS 6 -#define LNG_CHAN_HELP 0 -#define LNG_ENFORCE_SYNTAX 1 -#define LNG_CHAN_HELP_ENFORCE 2 -#define LNG_CHAN_HELP_ENFORCE_R_ENABLED 3 -#define LNG_CHAN_HELP_ENFORCE_R_DISABLED 4 -#define LNG_CHAN_RESPONSE 5 +#define LNG_CHAN_HELP 0 +#define LNG_ENFORCE_SYNTAX 1 +#define LNG_CHAN_HELP_ENFORCE 2 +#define LNG_CHAN_HELP_ENFORCE_R_ENABLED 3 +#define LNG_CHAN_HELP_ENFORCE_R_DISABLED 4 +#define LNG_CHAN_RESPONSE 5 class CSEnforce : public Module { @@ -52,7 +52,7 @@ class CSEnforce : public Module /* English (US) */ const char* langtable_en_us[] = { /* LNG_CHAN_HELP */ - " ENFORCE Enforce various channel modes and set options", + " ENFORCE Enforce various channel modes and set options", /* LNG_ENFORCE_SYNTAX */ "Syntax: \002ENFORCE \037channel\037 [\037what\037]\002", /* LNG_CHAN_HELP_ENFORCE */ @@ -86,7 +86,7 @@ class CSEnforce : public Module /* Dutch (NL) */ const char* langtable_nl[] = { /* LNG_CHAN_HELP */ - " ENFORCE Forceer enkele kanaalmodes en set-opties", + " ENFORCE Forceer enkele kanaalmodes en set-opties", /* LNG_ENFORCE_SYNTAX */ "Syntax: \002ENFORCE \037kanaal\037 [\037wat\037]\002", /* LNG_CHAN_HELP_ENFORCE */ @@ -122,7 +122,7 @@ class CSEnforce : public Module /* German (DE) */ const char* langtable_de[] = { /* LNG_CHAN_HELP */ - " ENFORCE Erzwingt verschieden Modes und SET Optionen", + " ENFORCE Erzwingt verschieden Modes und SET Optionen", /* LNG_ENFORCE_SYNTAX */ "Syntax: \002ENFORCE \037Channel\037 [\037was\037]\002", /* LNG_CHAN_HELP_ENFORCE */ @@ -155,7 +155,7 @@ class CSEnforce : public Module /* Portuguese (PT) */ const char* langtable_pt[] = { /* LNG_CHAN_HELP */ - " ENFORCE Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas", + " 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 */ @@ -188,7 +188,7 @@ class CSEnforce : public Module /* Russian (RU) */ const char* langtable_ru[] = { /* LNG_CHAN_HELP */ - " ENFORCE Перепроверка и установка различных режимов и опций канала", + " ENFORCE Перепроверка и установка различных режимов и опций канала", /* LNG_ENFORCE_SYNTAX */ "Синтаксис: \002ENFORCE \037#канал\037 \037параметр\037\002", /* LNG_CHAN_HELP_ENFORCE */ @@ -220,7 +220,7 @@ class CSEnforce : public Module /* Italian (IT) */ const char* langtable_it[] = { /* LNG_CHAN_HELP */ - " ENFORCE Forza diversi modi di canale ed opzioni SET", + " ENFORCE Forza diversi modi di canale ed opzioni SET", /* LNG_ENFORCE_SYNTAX */ "Sintassi: \002ENFORCE \037canale\037 [\037cosa\037]\002", /* LNG_CHAN_HELP_ENFORCE */ @@ -264,206 +264,206 @@ 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; + 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; + 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['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); + 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['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; + ChannelInfo *ci; - if (!(ci = c->ci)) - return; + if (!(ci = c->ci)) + return; - if (ci->flags & CI_SECUREOPS) - do_enforce_secureops(c); - if (ci->flags & CI_RESTRICTED) - do_enforce_restricted(c); + 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; + CBMode *cbm; - if (((cbm = &cbmodes['R'])->flag != 0) && (c->mode & cbm->flag)) - do_enforce_cmode_R(c); + if (((cbm = &cbmodes['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) { - moduleNoticeLang(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); - moduleNoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); - } else if (stricmp(what, "MODES") == 0) { - do_enforce_modes(c); - moduleNoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); - } else if (stricmp(what, "SECUREOPS") == 0) { - do_enforce_secureops(c); - moduleNoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); - } else if (stricmp(what, "RESTRICTED") == 0) { - do_enforce_restricted(c); - moduleNoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); - } else if (stricmp(what, "+R") == 0) { - do_enforce_cmode_R(c); - moduleNoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); - } else { - moduleNoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX); - } - } - - if(chan) free(chan); - if(what) free(what); - - return MOD_CONT; + char *cur_buffer; + char *chan=NULL; + char *what=NULL; + Channel *c; + ChannelInfo *ci; + + cur_buffer = moduleGetLastBuffer(); + chan = myStrGetToken(cur_buffer, ' ', 0); + + if (!chan) { + moduleNoticeLang(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); + moduleNoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); + } else if (stricmp(what, "MODES") == 0) { + do_enforce_modes(c); + moduleNoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); + } else if (stricmp(what, "SECUREOPS") == 0) { + do_enforce_secureops(c); + moduleNoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); + } else if (stricmp(what, "RESTRICTED") == 0) { + do_enforce_restricted(c); + moduleNoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); + } else if (stricmp(what, "+R") == 0) { + do_enforce_cmode_R(c); + moduleNoticeLang(s_ChanServ,u,LNG_CHAN_RESPONSE,what); + } else { + moduleNoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX); + } + } + + if(chan) free(chan); + if(what) free(what); + + return MOD_CONT; } /* Language and response stuff */ void my_cs_help(User * u) { - moduleNoticeLang(s_ChanServ, u, LNG_CHAN_HELP); + moduleNoticeLang(s_ChanServ, u, LNG_CHAN_HELP); } int my_cs_help_enforce(User * u) { - moduleNoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX); - ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); - moduleNoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE); - ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); - if (cbmodes['R'].flag != 0) - moduleNoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED); - else - moduleNoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_DISABLED); - - return MOD_STOP; + moduleNoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX); + ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); + moduleNoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE); + ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); + if (cbmodes['R'].flag != 0) + moduleNoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED); + else + moduleNoticeLang(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 327ec43e6..6045c7a98 100644 --- a/src/modules/cs_tban.c +++ b/src/modules/cs_tban.c @@ -33,11 +33,11 @@ int canBanUser(Channel * c, User * u, User * u2); void mAddLanguages(void); -#define LANG_NUM_STRINGS 4 -#define TBAN_HELP 0 -#define TBAN_SYNTAX 1 -#define TBAN_HELP_DETAIL 2 -#define TBAN_RESPONSE 3 +#define LANG_NUM_STRINGS 4 +#define TBAN_HELP 0 +#define TBAN_SYNTAX 1 +#define TBAN_HELP_DETAIL 2 +#define TBAN_RESPONSE 3 class CSTBan : public Module { @@ -56,7 +56,7 @@ class CSTBan : public Module this->SetType(SUPPORTED); const char* langtable_en_us[] = { - " TBAN Bans the user for a given length of time", + " 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.", @@ -64,7 +64,7 @@ class CSTBan : public Module }; const char* langtable_nl[] = { - " TBAN Verban een gebruiker voor een bepaalde tijd", + " 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" @@ -73,7 +73,7 @@ class CSTBan : public Module }; const char* langtable_de[] = { - " TBAN Bant ein User fьr eine bestimmte Zeit aus ein Channel", + " 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.", @@ -81,7 +81,7 @@ class CSTBan : public Module }; const char* langtable_pt[] = { - " TBAN Bane o usuбrio por um determinado perнodo de tempo", + " 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.", @@ -89,7 +89,7 @@ class CSTBan : public Module }; const char* langtable_ru[] = { - " TBAN Банит пользователя на указанный промежуток времени", + " TBAN Банит пользователя на указанный промежуток времени", "Синтаксис: TBAN #канал ник время", "Банит пользователя на указанный промежуток времени в секундах\n" "Примечание: удаленный вручную (до своего истечения) бан НЕ БУДЕТ\n" @@ -98,7 +98,7 @@ class CSTBan : public Module }; const char* langtable_it[] = { - " TBAN Banna l'utente per un periodo di tempo specificato", + " 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.", @@ -118,120 +118,120 @@ class CSTBan : public Module void myHelp(User * u) { - moduleNoticeLang(s_ChanServ, u, TBAN_HELP); + moduleNoticeLang(s_ChanServ, u, TBAN_HELP); } void myFullHelpSyntax(User * u) { - moduleNoticeLang(s_ChanServ, u, TBAN_SYNTAX); + moduleNoticeLang(s_ChanServ, u, TBAN_SYNTAX); } int myFullHelp(User * u) { - myFullHelpSyntax(u); - ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); - moduleNoticeLang(s_ChanServ, u, TBAN_HELP_DETAIL); - return MOD_CONT; + myFullHelpSyntax(u); + ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); + moduleNoticeLang(s_ChanServ, u, TBAN_HELP_DETAIL); + return MOD_CONT; } void mySendResponse(User * u, char *channel, char *mask, char *time) { - moduleNoticeLang(s_ChanServ, u, TBAN_RESPONSE, mask, channel, time); + moduleNoticeLang(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) - free(time); - if (nick) - free(nick); - if (chan) - free(chan); - - return MOD_CONT; + 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) + free(time); + if (nick) + free(nick); + if (chan) + free(chan); + + return MOD_CONT; } void addBan(Channel * c, time_t timeout, char *banmask) { - const char *av[3]; - char *cb[2]; + const char *av[3]; + char *cb[2]; - cb[0] = c->name; - cb[1] = banmask; + cb[0] = c->name; + cb[1] = banmask; - av[0] = "+b"; - av[1] = banmask; + av[0] = "+b"; + av[1] = banmask; - ircdproto->SendMode(whosends(c->ci), c->name, "+b %s", av[1]); - chan_set_modes(s_ChanServ, c, 2, av, 1); + ircdproto->SendMode(whosends(c->ci), c->name, "+b %s", av[1]); + chan_set_modes(s_ChanServ, c, 2, av, 1); - moduleAddCallback("tban", time(NULL) + timeout, delBan, 2, cb); + moduleAddCallback("tban", time(NULL) + timeout, delBan, 2, cb); } int delBan(int argc, char **argv) { - const char *av[3]; - Channel *c; + const char *av[3]; + Channel *c; - av[0] = "-b"; - av[1] = argv[1]; + av[0] = "-b"; + av[1] = argv[1]; - 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); - } + 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); + } - return MOD_CONT; + return MOD_CONT; } int canBanUser(Channel * c, User * u, User * u2) { - ChannelInfo *ci; - int ok = 0; - 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, c->name); - } else if (!check_access(u, ci, CA_BAN)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); - } 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)) { - notice_lang(s_ChanServ, u, PERMISSION_DENIED); - } else { - ok = 1; - } - - return ok; + ChannelInfo *ci; + int ok = 0; + 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, c->name); + } else if (!check_access(u, ci, CA_BAN)) { + notice_lang(s_ChanServ, u, ACCESS_DENIED); + } 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)) { + notice_lang(s_ChanServ, u, PERMISSION_DENIED); + } else { + ok = 1; + } + + return ok; } diff --git a/src/modules/demos/catserv/catserv_messages.c b/src/modules/demos/catserv/catserv_messages.c index 23c1b4ec1..667b336b5 100644 --- a/src/modules/demos/catserv/catserv_messages.c +++ b/src/modules/demos/catserv/catserv_messages.c @@ -5,10 +5,10 @@ void addMessageList(void) { - Command *c; - c = createCommand("meow", do_meow, NULL, -1, -1, -1, -1, -1); - this->AddCommand(Catserv_cmdTable, c, MOD_UNIQUE); - c = createCommand("purr", do_purr, NULL, -1, -1, -1, -1, -1); - this->AddCommand(Catserv_cmdTable, c, MOD_UNIQUE); + Command *c; + c = createCommand("meow", do_meow, NULL, -1, -1, -1, -1, -1); + this->AddCommand(Catserv_cmdTable, c, MOD_UNIQUE); + c = createCommand("purr", do_purr, NULL, -1, -1, -1, -1, -1); + this->AddCommand(Catserv_cmdTable, c, MOD_UNIQUE); } diff --git a/src/modules/demos/catserv/ircd_catserv.c b/src/modules/demos/catserv/ircd_catserv.c index 763ae9cec..0f98df58a 100644 --- a/src/modules/demos/catserv/ircd_catserv.c +++ b/src/modules/demos/catserv/ircd_catserv.c @@ -22,89 +22,89 @@ char *s_CatServ = "CatServ"; int AnopeInit(int argc, char **argv) { - Message *msg = NULL; - int status; + Message *msg = NULL; + int status; #ifdef IRC_UNREAL32 - if (UseTokens) { - msg = createMessage("!", my_privmsg); - } else { - msg = createMessage("PRIVMSG", my_privmsg); - } + if (UseTokens) { + msg = createMessage("!", my_privmsg); + } else { + msg = createMessage("PRIVMSG", my_privmsg); + } #else - msg = createMessage("PRIVMSG", my_privmsg); + msg = createMessage("PRIVMSG", my_privmsg); #endif - status = moduleAddMessage(msg, MOD_HEAD); - if (status == MOD_ERR_OK) { - addClient(s_CatServ, "meow!"); - addMessageList(); - } - this->SetAuthor(AUTHOR); - this->SetVersion(VERSION); - alog("ircd_catserv.so: loaded, message status [%d]", status); - return MOD_CONT; + status = moduleAddMessage(msg, MOD_HEAD); + if (status == MOD_ERR_OK) { + addClient(s_CatServ, "meow!"); + addMessageList(); + } + this->SetAuthor(AUTHOR); + this->SetVersion(VERSION); + alog("ircd_catserv.so: loaded, message status [%d]", status); + return MOD_CONT; } void AnopeFini(void) { - delClient(); + delClient(); } int my_privmsg(char *source, int ac, char **av) { - User *u; - char *s; + User *u; + char *s; - /* First, some basic checks */ - if (ac != 2) - return MOD_CONT; /* bleh */ - if (!(u = finduser(source))) { - return MOD_CONT; - } /* non-user source */ - if (*av[0] == '#') { - return MOD_CONT; - } - /* Channel message */ - /* we should prolly honour the ignore list here, but i cba for this... */ - s = strchr(av[0], '@'); - if (s) { - *s++ = 0; - if (stricmp(s, ServerName) != 0) - return MOD_CONT; - } - if ((stricmp(av[0], s_CatServ)) == 0) { /* its for US! */ - catserv(u, av[1]); - return MOD_STOP; - } else { /* ok it isnt us, let the old code have it */ - return MOD_CONT; - } + /* First, some basic checks */ + if (ac != 2) + return MOD_CONT; /* bleh */ + if (!(u = finduser(source))) { + return MOD_CONT; + } /* non-user source */ + if (*av[0] == '#') { + return MOD_CONT; + } + /* Channel message */ + /* we should prolly honour the ignore list here, but i cba for this... */ + s = strchr(av[0], '@'); + if (s) { + *s++ = 0; + if (stricmp(s, ServerName) != 0) + return MOD_CONT; + } + if ((stricmp(av[0], s_CatServ)) == 0) { /* its for US! */ + catserv(u, av[1]); + return MOD_STOP; + } else { /* ok it isnt us, let the old code have it */ + return MOD_CONT; + } } void addClient(char *nick, char *realname) { - anope_SendClientIntroduction(nick, "catserv", "meow.meow.land", realname, "+"); + anope_SendClientIntroduction(nick, "catserv", "meow.meow.land", realname, "+"); } void delClient(void) { - anope_SendQuit(s_CatServ, "QUIT :Module Unloaded!"); + anope_SendQuit(s_CatServ, "QUIT :Module Unloaded!"); } /*****************************************************************************/ /* Main CatServ routine. */ void catserv(User * u, char *buf) { - char *cmd, *s; + char *cmd, *s; - cmd = strtok(buf, " "); + cmd = strtok(buf, " "); - if (!cmd) { - return; - } else if (stricmp(cmd, "\1PING") == 0) { - if (!(s = strtok(NULL, ""))) - s = "\1"; - notice(s_CatServ, u->nick, "\1PING %s", s); - } else { - mod_run_cmd(s_CatServ, u, Catserv_cmdTable, cmd); - } + if (!cmd) { + return; + } else if (stricmp(cmd, "\1PING") == 0) { + if (!(s = strtok(NULL, ""))) + s = "\1"; + notice(s_CatServ, u->nick, "\1PING %s", s); + } else { + mod_run_cmd(s_CatServ, u, Catserv_cmdTable, cmd); + } } diff --git a/src/modules/demos/catserv/purr.c b/src/modules/demos/catserv/purr.c index 5a39dc26e..e7c1e9c8d 100644 --- a/src/modules/demos/catserv/purr.c +++ b/src/modules/demos/catserv/purr.c @@ -3,6 +3,6 @@ int do_purr(User * u) { - notice(s_CatServ, u->nick, "PURR!"); - return MOD_STOP; + notice(s_CatServ, u->nick, "PURR!"); + return MOD_STOP; } diff --git a/src/modules/demos/events.c b/src/modules/demos/events.c index 25dd79fb9..bea3ccd6d 100644 --- a/src/modules/demos/events.c +++ b/src/modules/demos/events.c @@ -17,22 +17,22 @@ int do_moo(int argc, char **argv); int AnopeInit(int argc, char **argv) { - EvtMessage *msg = NULL; - EvtHook *hook = NULL; - int status; - msg = createEventHandler("NICK", my_nick); - status = moduleAddEventHandler(msg); + EvtMessage *msg = NULL; + EvtHook *hook = NULL; + int status; + msg = createEventHandler("NICK", my_nick); + status = moduleAddEventHandler(msg); - hook = createEventHook(EVENT_DB_SAVING, my_save); - status = this->AddEventHook(hook); + hook = createEventHook(EVENT_DB_SAVING, my_save); + status = this->AddEventHook(hook); - hook = createEventHook(EVENT_BOT_FANTASY, do_moo); - status = this->AddEventHook(hook); - - this->SetAuthor(AUTHOR); - this->SetVersion(VERSION); - return MOD_CONT; + hook = createEventHook(EVENT_BOT_FANTASY, do_moo); + status = this->AddEventHook(hook); + + this->SetAuthor(AUTHOR); + this->SetVersion(VERSION); + return MOD_CONT; } void AnopeFini(void) @@ -50,9 +50,9 @@ int my_save(int argc, char **argv) { if(argc>=1) { if (!stricmp(argv[0], EVENT_START)) { - alog("Saving the databases! has started"); + alog("Saving the databases! has started"); } else { - alog("Saving the databases is complete"); + alog("Saving the databases is complete"); } } return MOD_CONT; @@ -68,15 +68,15 @@ int my_save(int argc, char **argv) * @return MOD_CONT or MOD_STOP **/ int do_moo(int argc, char **argv) { - ChannelInfo *ci; - if(argc>=3) { /* We need at least 3 arguments */ + ChannelInfo *ci; + if(argc>=3) { /* We need at least 3 arguments */ if(stricmp(argv[0],"moo")==0) { /* is it meant for us? */ - if((ci = cs_findchan(argv[2]))) { /* channel should always exist */ - anope_cmd_privmsg(ci->bi->nick, ci->name, "%cACTION moo's at %s %c",1,argv[1],1); - return MOD_STOP; /* We've dealt with it, dont let others */ - } + if((ci = cs_findchan(argv[2]))) { /* channel should always exist */ + anope_cmd_privmsg(ci->bi->nick, ci->name, "%cACTION moo's at %s %c",1,argv[1],1); + return MOD_STOP; /* We've dealt with it, dont let others */ + } } - } - return MOD_CONT; /* guess it wasnt for us, pass it on */ + } + return MOD_CONT; /* guess it wasnt for us, pass it on */ } diff --git a/src/modules/demos/hs_conf.c b/src/modules/demos/hs_conf.c index 233aa2ff1..755b1bae4 100644 --- a/src/modules/demos/hs_conf.c +++ b/src/modules/demos/hs_conf.c @@ -14,24 +14,24 @@ int mReadConfig(int argc, char **argv); char *setting; int AnopeInit(int argc, char **argv) { - Command *c; - EvtHook *hook; - int status = 0; + Command *c; + EvtHook *hook; + int status = 0; - setting = NULL; + setting = NULL; - mReadConfig(0,NULL); - - c = createCommand("SHOW",mShowSetting,NULL,-1,-1,-1,-1,-1); - status = this->AddCommand(HOSTSERV, c, MOD_HEAD); + mReadConfig(0,NULL); + + c = createCommand("SHOW",mShowSetting,NULL,-1,-1,-1,-1,-1); + status = this->AddCommand(HOSTSERV, c, MOD_HEAD); - hook = createEventHook(EVENT_RELOAD, mReadConfig); - status = this->AddEventHook(hook); - - if(status!=MOD_ERR_OK) { + hook = createEventHook(EVENT_RELOAD, mReadConfig); + status = this->AddEventHook(hook); + + if(status!=MOD_ERR_OK) { return MOD_STOP; - } - return MOD_CONT; + } + return MOD_CONT; } /** @@ -46,8 +46,8 @@ void AnopeFini(void) { * Simple function to show the user the current config setting **/ int mShowSetting(User *u) { - notice(s_HostServ,u->nick,"Setting in use is [%s]",setting); - return MOD_CONT; + notice(s_HostServ,u->nick,"Setting in use is [%s]",setting); + return MOD_CONT; } /** @@ -55,19 +55,19 @@ int mShowSetting(User *u) { * the EVENT_RELOAD event is recived. **/ int mReadConfig(int argc, char **argv) { - char *tmp=NULL; - Directive d[] = {{"HSConfigSetting", {{PARAM_STRING, PARAM_RELOAD, &tmp}}}}; - moduleGetConfigDirective(d); + char *tmp=NULL; + Directive d[] = {{"HSConfigSetting", {{PARAM_STRING, PARAM_RELOAD, &tmp}}}}; + moduleGetConfigDirective(d); - if(setting) { - free(setting); - } - if(tmp) { + if(setting) { + free(setting); + } + if(tmp) { setting = tmp; - } else { + } else { setting = sstrdup(DEFAULT_SETTING); - } - return MOD_CONT; + } + return MOD_CONT; } diff --git a/src/modules/demos/hs_moo.c b/src/modules/demos/hs_moo.c index 61210271b..ab677527c 100644 --- a/src/modules/demos/hs_moo.c +++ b/src/modules/demos/hs_moo.c @@ -22,22 +22,22 @@ int myHostServMooRootHelp(User *u); /* Function to display extra help t int AnopeInit(int argc, char **argv) /* This will be executed when the module is loaded */ { - Command *c; /* Pointer to a Command */ - int status = 0; /* the status of our new command */ - c = createCommand("moo", hs_moo_show, NULL, -1, -1, -1, -1, -1); /* Create a new command "moo" pointing to hs_moo */ + Command *c; /* Pointer to a Command */ + int status = 0; /* the status of our new command */ + c = createCommand("moo", hs_moo_show, NULL, -1, -1, -1, -1, -1); /* Create a new command "moo" pointing to hs_moo */ - moduleAddHelp(c,myHostServMooHelp); /* add help for all users to this command */ - moduleAddRegHelp(c,myHostServMooRegHelp); /* add extra regular-user only help to this command */ - moduleAddOperHelp(c,myHostServMooOperHelp); /* add extra oper only help to this command */ - moduleAddAdminHelp(c,myHostServMooAdminHelp); /* add extra admin only help to this command */ - moduleAddRootHelp(c,myHostServMooRootHelp); /* add extra root only help to this command */ + moduleAddHelp(c,myHostServMooHelp); /* add help for all users to this command */ + moduleAddRegHelp(c,myHostServMooRegHelp); /* add extra regular-user only help to this command */ + moduleAddOperHelp(c,myHostServMooOperHelp); /* add extra oper only help to this command */ + moduleAddAdminHelp(c,myHostServMooAdminHelp); /* add extra admin only help to this command */ + moduleAddRootHelp(c,myHostServMooRootHelp); /* add extra root only help to this command */ - moduleSetHostHelp(myHostServHelp); /* add us to the .hs help list */ + moduleSetHostHelp(myHostServHelp); /* add us to the .hs help list */ - status = this->AddCommand(HOSTSERV, c, MOD_HEAD); /* Add the command to the HOSTSERV cmd table */ + status = this->AddCommand(HOSTSERV, c, MOD_HEAD); /* Add the command to the HOSTSERV cmd table */ - /* Check if we have any argv's */ - if(argc>0) { + /* Check if we have any argv's */ + if(argc>0) { /* we do, the first will be the nick of the person modload'ing us */ /* or NULL if we were auto-loaded */ if(argv[0]) { @@ -45,24 +45,24 @@ int AnopeInit(int argc, char **argv) /* This will be executed when the mod } else { alog("hs_moo was automatically loaded by anope"); } - } - alog("hs_moo.so: Add Command 'moo' Status: %d",status); /* Log the command being added */ - - moduleAddCallback("test",time(NULL)+dotime("15s"),test,0,NULL); /* set a call-back function to exec in 3 mins time */ - moduleDelCallback("test"); - this->SetAuthor(AUTHOR); /* tell Anope about the author */ - this->SetVersion(VERSION); /* Tell Anope about the verison */ - - if(status!=MOD_ERR_OK) { + } + alog("hs_moo.so: Add Command 'moo' Status: %d",status); /* Log the command being added */ + + moduleAddCallback("test",time(NULL)+dotime("15s"),test,0,NULL); /* set a call-back function to exec in 3 mins time */ + moduleDelCallback("test"); + this->SetAuthor(AUTHOR); /* tell Anope about the author */ + this->SetVersion(VERSION); /* Tell Anope about the verison */ + + if(status!=MOD_ERR_OK) { return MOD_STOP; - } - return MOD_CONT; + } + return MOD_CONT; } int hs_moo_show(User * u) { - notice(s_HostServ, u->nick, "MOO! - This command was loaded via a module!"); /* Just notice the user */ - return MOD_STOP; /* MOD_STOP means we will NOT pass control back to other */ + notice(s_HostServ, u->nick, "MOO! - This command was loaded via a module!"); /* Just notice the user */ + return MOD_STOP; /* MOD_STOP means we will NOT pass control back to other */ } /* modules waiting to handle the /hs moo command! */ int test(int argc, char **argv) { @@ -76,11 +76,11 @@ void AnopeFini(void) } /***************************************************************************************************************************************/ -/* The code below here shows various ways of dealing with the module help system */ +/* The code below here shows various ways of dealing with the module help system */ /***************************************************************************************************************************************/ void myHostServHelp(User *u) { - notice(s_HostServ,u->nick, " MOO Moo's at the user!"); /* this will appear in the help list */ + notice(s_HostServ,u->nick, " MOO Moo's at the user!"); /* this will appear in the help list */ } int myHostServMooHelp(User *u) { diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c index cd9939e96..e9ad605a8 100644 --- a/src/modules/hs_request.c +++ b/src/modules/hs_request.c @@ -1,5 +1,5 @@ /* hs_request.c - Add request and activate functionality to HostServ, - * along with adding +req as optional param to HostServ list. + * along with adding +req as optional param to HostServ list. * * (C) 2003-2008 Anope Team * Contact us at info@anope.org @@ -65,7 +65,7 @@ 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); + 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); @@ -155,11 +155,11 @@ class HSRequest : public Module /* LNG_NO_REQUEST */ "No request for nick %s found.", /* LNG_HELP */ - " REQUEST Request a vHost for your nick", + " REQUEST Request a vHost for your nick", /* LNG_HELP_SETTER */ - " ACTIVATE Approve the requested vHost of a user\n" - " REJECT Reject the requested vHost of a user\n" - " WAITING Convenience command for LIST +req", + " ACTIVATE Approve the requested vHost of a user\n" + " REJECT Reject the requested vHost of a user\n" + " WAITING Convenience command for LIST +req", /* LNG_HELP_REQUEST */ "Request the given vHost to be actived for your nick by the\n" "network administrators. Please be patient while your request\n" @@ -205,11 +205,11 @@ class HSRequest : public Module /* LNG_NO_REQUEST */ "Geen aanvraag voor nick %s gevonden.", /* LNG_HELP */ - " REQUEST Vraag een vHost aan voor je nick", + " REQUEST Vraag een vHost aan voor je nick", /* LNG_HELP_SETTER */ - " ACTIVATE Activeer de aangevraagde vHost voor een gebruiker\n" - " REJECT Keur de aangevraagde vHost voor een gebruiker af\n" - " WAITING Snelkoppeling naar LIST +req", + " ACTIVATE Activeer de aangevraagde vHost voor een gebruiker\n" + " REJECT Keur de aangevraagde vHost voor een gebruiker af\n" + " WAITING Snelkoppeling naar LIST +req", /* LNG_HELP_REQUEST */ "Verzoek de gegeven vHost te activeren voor jouw nick bij de\n" "netwerk beheerders. Het kan even duren voordat je aanvraag\n" @@ -255,11 +255,11 @@ class HSRequest : public Module /* LNG_NO_REQUEST */ "Nenhum pedido encontrado para o nick %s.", /* LNG_HELP */ - " REQUEST Request a vHost for your nick", + " REQUEST Request a vHost for your nick", /* LNG_HELP_SETTER */ - " ACTIVATE Aprova o pedido de vHost de um usuбrio\n" - " REJECT Recusa o pedido de vHost de um usuбrio\n" - " WAITING Comando para LISTAR +req", + " ACTIVATE Aprova o pedido de vHost de um usuбrio\n" + " REJECT Recusa o pedido de vHost de um usuбrio\n" + " WAITING Comando para LISTAR +req", /* LNG_HELP_REQUEST */ "Solicita a ativaзгo do vHost fornecido em seu nick pelos\n" "administradores da rede. Por favor, tenha paciкncia\n" @@ -305,11 +305,11 @@ class HSRequest : public Module /* LNG_NO_REQUEST */ "Запрос на vHost для ника %s не найден.", /* LNG_HELP */ - " REQUEST Запрос на vHost для вашего текущего ника", + " REQUEST Запрос на vHost для вашего текущего ника", /* LNG_HELP_SETTER */ - " ACTIVATE Утвердить запрашиваемый пользователем vHost\n" - " REJECT Отклонить запрашиваемый пользователем vHost\n" - " WAITING Список запросов ожидающих обработки (аналог LIST +req)", + " ACTIVATE Утвердить запрашиваемый пользователем vHost\n" + " REJECT Отклонить запрашиваемый пользователем vHost\n" + " WAITING Список запросов ожидающих обработки (аналог LIST +req)", /* LNG_HELP_REQUEST */ "Отправляет запрос на активацию vHost, который будет рассмотрен одним из\n" "администраторов сети. Просьба проявить терпение, пока запрос\n" @@ -355,11 +355,11 @@ class HSRequest : public Module /* LNG_NO_REQUEST */ "Nessuna richiesta trovata per il nick %s.", /* LNG_HELP */ - " REQUEST Richiede un vHost per il tuo nick", + " REQUEST Richiede un vHost per il tuo nick", /* LNG_HELP_SETTER */ - " ACTIVATE Approva il vHost richiesto di un utente\n" - " REJECT Rifiuta il vHost richiesto di un utente\n" - " WAITING Comando per LIST +req", + " ACTIVATE Approva il vHost richiesto di un utente\n" + " REJECT Rifiuta il vHost richiesto di un utente\n" + " WAITING Comando per LIST +req", /* LNG_HELP_REQUEST */ "Richiede l'attivazione del vHost specificato per il tuo nick da parte\n" "degli amministratori di rete. Sei pregato di pazientare finchи la tua\n" @@ -400,577 +400,577 @@ class HSRequest : public Module int hs_do_request(User * u) { - char *cur_buffer; - char *nick; - char *rawhostmask; - char hostmask[HOSTMAX]; - NickAlias *na; - int32 tmp_time; - char *s; - char *vIdent = NULL; - time_t now = time(NULL); - - cur_buffer = moduleGetLastBuffer(); - nick = u->nick; - rawhostmask = myStrGetToken(cur_buffer, ' ', 0); - - if (!nick || !rawhostmask) { - if (rawhostmask) - free(rawhostmask); - moduleNoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); - return MOD_CONT; - } - - vIdent = myStrGetOnlyToken(rawhostmask, '@', 0); /* Get the first substring, @ as delimiter */ - if (vIdent) { - rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */ - if (!rawhostmask) { - moduleNoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); - free(vIdent); - return MOD_CONT; - } - if (strlen(vIdent) > USERMAX - 1) { - notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX); - free(vIdent); - free(rawhostmask); - return MOD_CONT; - } else { - for (s = vIdent; *s; s++) { - if (!my_isvalidchar(*s)) { - notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR); - free(vIdent); - free(rawhostmask); - return MOD_CONT; - } - } - } - if (!ircd->vident) { - notice_lang(s_HostServ, u, HOST_NO_VIDENT); - free(vIdent); - free(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) - free(vIdent); - free(rawhostmask); - return MOD_CONT; - } - - if (!isValidHost(hostmask, 3)) { - notice_lang(s_HostServ, u, HOST_SET_ERROR); - if (vIdent) - free(vIdent); - free(rawhostmask); - return MOD_CONT; - } - - tmp_time = time(NULL); - if ((na = findnick(nick))) { - if (HSRequestMemoOper || HSRequestMemoSetters) { - if (MSSendDelay > 0 && u - && u->lastmemosend + MSSendDelay > now) { - moduleNoticeLang(s_HostServ, u, LNG_REQUEST_WAIT, - MSSendDelay); - u->lastmemosend = now; - if (vIdent) - free(vIdent); - free(rawhostmask); - return MOD_CONT; - } - } - my_add_host_request(nick, vIdent, hostmask, u->nick, tmp_time); - - moduleNoticeLang(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) - free(vIdent); - free(rawhostmask); - - return MOD_CONT; + char *cur_buffer; + char *nick; + char *rawhostmask; + char hostmask[HOSTMAX]; + NickAlias *na; + int32 tmp_time; + char *s; + char *vIdent = NULL; + time_t now = time(NULL); + + cur_buffer = moduleGetLastBuffer(); + nick = u->nick; + rawhostmask = myStrGetToken(cur_buffer, ' ', 0); + + if (!nick || !rawhostmask) { + if (rawhostmask) + free(rawhostmask); + moduleNoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); + return MOD_CONT; + } + + vIdent = myStrGetOnlyToken(rawhostmask, '@', 0); /* Get the first substring, @ as delimiter */ + if (vIdent) { + rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */ + if (!rawhostmask) { + moduleNoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); + free(vIdent); + return MOD_CONT; + } + if (strlen(vIdent) > USERMAX - 1) { + notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX); + free(vIdent); + free(rawhostmask); + return MOD_CONT; + } else { + for (s = vIdent; *s; s++) { + if (!my_isvalidchar(*s)) { + notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR); + free(vIdent); + free(rawhostmask); + return MOD_CONT; + } + } + } + if (!ircd->vident) { + notice_lang(s_HostServ, u, HOST_NO_VIDENT); + free(vIdent); + free(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) + free(vIdent); + free(rawhostmask); + return MOD_CONT; + } + + if (!isValidHost(hostmask, 3)) { + notice_lang(s_HostServ, u, HOST_SET_ERROR); + if (vIdent) + free(vIdent); + free(rawhostmask); + return MOD_CONT; + } + + tmp_time = time(NULL); + if ((na = findnick(nick))) { + if (HSRequestMemoOper || HSRequestMemoSetters) { + if (MSSendDelay > 0 && u + && u->lastmemosend + MSSendDelay > now) { + moduleNoticeLang(s_HostServ, u, LNG_REQUEST_WAIT, + MSSendDelay); + u->lastmemosend = now; + if (vIdent) + free(vIdent); + free(rawhostmask); + return MOD_CONT; + } + } + my_add_host_request(nick, vIdent, hostmask, u->nick, tmp_time); + + moduleNoticeLang(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) + free(vIdent); + free(rawhostmask); + + return MOD_CONT; } void my_memo_lang(User * u, char *name, int z, int number, ...) { - va_list va; - char buffer[4096], outbuf[4096]; - char *fmt = NULL; - int lang = LANG_EN_US; - char *s, *t, *buf; - User *u2; - - if ((mod_current_module_name) - && (!mod_current_module - || mod_current_module_name != mod_current_module->name)) - mod_current_module = findModule(mod_current_module_name); - - u2 = finduser(name); - /* Find the users lang, and use it if we cant */ - if (u2 && u2->na && u2->na->nc) - lang = u2->na->nc->language; - - /* If the users lang isnt supported, drop back to enlgish */ - if (mod_current_module->lang[lang].argc == 0) - lang = LANG_EN_US; - - /* If the requested lang string exists for the language */ - if (mod_current_module->lang[lang].argc > number) { - fmt = mod_current_module->lang[lang].argv[number]; - - buf = sstrdup(fmt); - s = buf; - while (*s) { - t = s; - s += strcspn(s, "\n"); - if (*s) - *s++ = '\0'; - strscpy(outbuf, t, sizeof(outbuf)); - - va_start(va, number); - vsnprintf(buffer, 4095, outbuf, va); - va_end(va); - memo_send(u, name, buffer, z); - } - free(buf); - } else { - alog("%s: INVALID language string call, language: [%d], String [%d]", mod_current_module->name.c_str(), lang, number); - } + va_list va; + char buffer[4096], outbuf[4096]; + char *fmt = NULL; + int lang = LANG_EN_US; + char *s, *t, *buf; + User *u2; + + if ((mod_current_module_name) + && (!mod_current_module + || mod_current_module_name != mod_current_module->name)) + mod_current_module = findModule(mod_current_module_name); + + u2 = finduser(name); + /* Find the users lang, and use it if we cant */ + if (u2 && u2->na && u2->na->nc) + lang = u2->na->nc->language; + + /* If the users lang isnt supported, drop back to enlgish */ + if (mod_current_module->lang[lang].argc == 0) + lang = LANG_EN_US; + + /* If the requested lang string exists for the language */ + if (mod_current_module->lang[lang].argc > number) { + fmt = mod_current_module->lang[lang].argv[number]; + + buf = sstrdup(fmt); + s = buf; + while (*s) { + t = s; + s += strcspn(s, "\n"); + if (*s) + *s++ = '\0'; + strscpy(outbuf, t, sizeof(outbuf)); + + va_start(va, number); + vsnprintf(buffer, 4095, outbuf, va); + va_end(va); + memo_send(u, name, buffer, z); + } + free(buf); + } else { + alog("%s: INVALID language string call, language: [%d], String [%d]", mod_current_module->name.c_str(), lang, number); + } } void req_send_memos(User * u, char *vHost) { - int i; - int z = 2; - - if (checkDefCon(DEFCON_NO_NEW_MEMOS)) - return; - - if (HSRequestMemoOper == 1) { - for (i = 0; i < servopers.count; i++) { - my_memo_lang(u, (((NickCore *) servopers.list[i])->display), z, - LNG_REQUEST_MEMO, vHost); - } - for (i = 0; i < servadmins.count; i++) { - my_memo_lang(u, (((NickCore *) servadmins.list[i])->display), - z, LNG_REQUEST_MEMO, vHost); - } - for (i = 0; i < RootNumber; i++) { - my_memo_lang(u, ServicesRoots[i], z, LNG_REQUEST_MEMO, vHost); - } - } - if (HSRequestMemoSetters == 1) { - for (i = 0; i < HostNumber; i++) { - my_memo_lang(u, HostSetters[i], z, LNG_REQUEST_MEMO, vHost); - } - } + int i; + int z = 2; + + if (checkDefCon(DEFCON_NO_NEW_MEMOS)) + return; + + if (HSRequestMemoOper == 1) { + for (i = 0; i < servopers.count; i++) { + my_memo_lang(u, (((NickCore *) servopers.list[i])->display), z, + LNG_REQUEST_MEMO, vHost); + } + for (i = 0; i < servadmins.count; i++) { + my_memo_lang(u, (((NickCore *) servadmins.list[i])->display), + z, LNG_REQUEST_MEMO, vHost); + } + for (i = 0; i < RootNumber; i++) { + my_memo_lang(u, ServicesRoots[i], z, LNG_REQUEST_MEMO, vHost); + } + } + if (HSRequestMemoSetters == 1) { + for (i = 0; i < HostNumber; i++) { + my_memo_lang(u, HostSetters[i], z, LNG_REQUEST_MEMO, vHost); + } + } } int ns_do_drop(User * u) { - HostCore *tmp; - bool found = false; - NickAlias *na; + HostCore *tmp; + bool found = false; + NickAlias *na; - na = findnick(u->nick); - tmp = findHostCore(hs_request_head, u->nick, &found); + na = findnick(u->nick); + tmp = findHostCore(hs_request_head, u->nick, &found); - if (found && na) - hs_request_head = deleteHostCore(hs_request_head, tmp); + if (found && na) + hs_request_head = deleteHostCore(hs_request_head, tmp); - return MOD_CONT; + return MOD_CONT; } int hs_do_reject(User * u) { - char *cur_buffer; - char *nick; - char *reason; - HostCore *tmp, *hc; - bool found = false; - - cur_buffer = moduleGetLastBuffer(); - nick = myStrGetToken(cur_buffer, ' ', 0); - reason = myStrGetTokenRemainder(cur_buffer, ' ', 1); - - if (!nick) { - moduleNoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX); - if (reason) - free(reason); - return MOD_CONT; - } - - 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); - moduleNoticeLang(s_HostServ, u, LNG_REJECTED, nick); - alog("Host Request for %s rejected by %s (%s)", nick, u->nick, - reason ? reason : ""); - } else { - moduleNoticeLang(s_HostServ, u, LNG_NO_REQUEST, nick); - } - - free(nick); - if (reason) - free(reason); - - return MOD_CONT; + char *cur_buffer; + char *nick; + char *reason; + HostCore *tmp, *hc; + bool found = false; + + cur_buffer = moduleGetLastBuffer(); + nick = myStrGetToken(cur_buffer, ' ', 0); + reason = myStrGetTokenRemainder(cur_buffer, ' ', 1); + + if (!nick) { + moduleNoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX); + if (reason) + free(reason); + return MOD_CONT; + } + + 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); + moduleNoticeLang(s_HostServ, u, LNG_REJECTED, nick); + alog("Host Request for %s rejected by %s (%s)", nick, u->nick, + reason ? reason : ""); + } else { + moduleNoticeLang(s_HostServ, u, LNG_NO_REQUEST, nick); + } + + free(nick); + if (reason) + free(reason); + + return MOD_CONT; } int hs_do_activate(User * u) { - char *cur_buffer; - char *nick; - NickAlias *na; - HostCore *tmp, *hc; - bool found = false; - - cur_buffer = moduleGetLastBuffer(); - nick = myStrGetToken(cur_buffer, ' ', 0); - - if (!nick) { - moduleNoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX); - return MOD_CONT; - } - - 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); - moduleNoticeLang(s_HostServ, u, LNG_ACTIVATED, nick); - alog("Host Request for %s activated by %s", nick, u->nick); - } else { - moduleNoticeLang(s_HostServ, u, LNG_NO_REQUEST, nick); - } - } else { - /* Should be "User Not Found" instead */ - moduleNoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX); - } - - free(nick); - return MOD_CONT; + char *cur_buffer; + char *nick; + NickAlias *na; + HostCore *tmp, *hc; + bool found = false; + + cur_buffer = moduleGetLastBuffer(); + nick = myStrGetToken(cur_buffer, ' ', 0); + + if (!nick) { + moduleNoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX); + return MOD_CONT; + } + + 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); + moduleNoticeLang(s_HostServ, u, LNG_ACTIVATED, nick); + alog("Host Request for %s activated by %s", nick, u->nick); + } else { + moduleNoticeLang(s_HostServ, u, LNG_NO_REQUEST, nick); + } + } else { + /* Should be "User Not Found" instead */ + moduleNoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX); + } + + free(nick); + return MOD_CONT; } void my_add_host_request(char *nick, char *vIdent, char *vhost, - char *creator, int32 tmp_time) + char *creator, int32 tmp_time) { - HostCore *tmp; - bool found = false; - - if (!hs_request_head) { - hs_request_head = - createHostCorelist(hs_request_head, nick, vIdent, vhost, - creator, tmp_time); - } else { - tmp = findHostCore(hs_request_head, nick, &found); - if (!found) { - hs_request_head = - insertHostCore(hs_request_head, tmp, nick, vIdent, vhost, - creator, tmp_time); - } else { - hs_request_head = deleteHostCore(hs_request_head, tmp); /* delete the old entry */ - my_add_host_request(nick, vIdent, vhost, creator, tmp_time); /* recursive call to add new entry */ - } - } + HostCore *tmp; + bool found = false; + + if (!hs_request_head) { + hs_request_head = + createHostCorelist(hs_request_head, nick, vIdent, vhost, + creator, tmp_time); + } else { + tmp = findHostCore(hs_request_head, nick, &found); + if (!found) { + hs_request_head = + insertHostCore(hs_request_head, tmp, nick, vIdent, vhost, + creator, tmp_time); + } else { + hs_request_head = deleteHostCore(hs_request_head, tmp); /* delete the old entry */ + my_add_host_request(nick, vIdent, vhost, creator, tmp_time); /* recursive call to add new entry */ + } + } } int my_isvalidchar(const char c) { - if (((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z')) - || ((c >= '0') && (c <= '9')) || (c == '.') || (c == '-')) - return 1; - else - return 0; + if (((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z')) + || ((c >= '0') && (c <= '9')) || (c == '.') || (c == '-')) + return 1; + else + return 0; } int hs_do_list_out(User * u) { - char *key; + char *key; - key = moduleGetLastBuffer(); - if (!key) - return MOD_CONT; + key = moduleGetLastBuffer(); + if (!key) + return MOD_CONT; - if (stricmp(key, "+req") != 0) - return MOD_CONT; + if (stricmp(key, "+req") != 0) + return MOD_CONT; - show_list(u); + show_list(u); - return MOD_CONT; + return MOD_CONT; } int hs_do_waiting(User * u) { - show_list(u); + show_list(u); - return MOD_CONT; + return MOD_CONT; } void show_list(User * u) { - 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 == 0) && (to == 0))) - && (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); + 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 == 0) && (to == 0))) + && (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); } int hs_help_request(User * u) { - moduleNoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); - ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); - moduleNoticeLang(s_HostServ, u, LNG_HELP_REQUEST); + moduleNoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); + ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); + moduleNoticeLang(s_HostServ, u, LNG_HELP_REQUEST); - return MOD_CONT; + return MOD_CONT; } int hs_help_activate(User * u) { - if (is_host_setter(u)) { - moduleNoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX); - ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); - moduleNoticeLang(s_HostServ, u, LNG_HELP_ACTIVATE); - if (HSRequestMemoUser) - moduleNoticeLang(s_HostServ, u, LNG_HELP_ACTIVATE_MEMO); - } else { - notice_lang(s_HostServ, u, NO_HELP_AVAILABLE, "ACTIVATE"); - } - - return MOD_CONT; + if (is_host_setter(u)) { + moduleNoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX); + ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); + moduleNoticeLang(s_HostServ, u, LNG_HELP_ACTIVATE); + if (HSRequestMemoUser) + moduleNoticeLang(s_HostServ, u, LNG_HELP_ACTIVATE_MEMO); + } else { + notice_lang(s_HostServ, u, N