diff options
157 files changed, 3492 insertions, 3537 deletions
diff --git a/include/configreader.h b/include/configreader.h index 017e254da..b5b124777 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -374,6 +374,388 @@ class ServerConfig void ValidateHostname(const char *, const std::string &, const std::string &); void ValidateIP(const char *p, const std::string &, const std::string &, bool); void ValidateNoSpaces(const char *, const std::string &, const std::string &); + + + + /** Below here is a list of variables which contain the config files values + */ + /* IRCd module in use */ + char *IRCDModule; + + /* Host to connect to **/ + char *LocalHost; + /* Port */ + unsigned LocalPort; + /* List of uplink servers to try and connect to */ + std::list<Uplink *> Uplinks; + + /* Our server name */ + char *ServerName; + /* Our servers description */ + char *ServerDesc; + /* The username/ident of services clients */ + char *ServiceUser; + /* The hostname if services clients */ + char *ServiceHost; + + /* Help channel, ops here get usermode +h **/ + char *HelpChannel; + /* Log channel */ + char *LogChannel; + /* Name of the network were on */ + char *NetworkName; + /* The max legnth of nicks */ + unsigned NickLen; + + /* NickServ Name */ + char *s_NickServ; + /* ChanServ Name */ + char *s_ChanServ; + /* MemoServ Name */ + char *s_MemoServ; + /* BotServ Name */ + char *s_BotServ; + /* OperServ name */ + char *s_OperServ; + /* Global name */ + char *s_GlobalNoticer; + /* NickServs realname */ + char *desc_NickServ; + /* ChanServ realname */ + char *desc_ChanServ; + /* MemoServ relname */ + char *desc_MemoServ; + /* BotServ realname */ + char *desc_BotServ; + /* OperServ realname */ + char *desc_OperServ; + /* Global realname */ + char *desc_GlobalNoticer; + + /* Name of the hostserv database */ + char *HostDBName; + /* HostServ Name */ + char *s_HostServ; + /* HostServ realname */ + char *desc_HostServ; + + /* Filename for the PID file */ + char *PIDFilename; + /* MOTD filename */ + char *MOTDFilename; + /* NickServ DB name */ + char *NickDBName; + /* DB name for nicks being registered */ + char *PreNickDBName; + /* Channel DB name */ + char *ChanDBName; + /* Botserv DB name */ + char *BotDBName; + /* OperServ db name */ + char *OperDBName; + /* News DB name */ + char *NewsDBName; + + /* True if its ok to not be able to save backs */ + bool NoBackupOkay; + /* Do password checking when new people register */ + bool StrictPasswords; + /* How many times you're allowed to give a bad password before being killed */ + unsigned BadPassLimit; + /* How long before bad passwords are forgotten */ + time_t BadPassTimeout; + /* Delay between automatic database updates */ + time_t UpdateTimeout; + /* Delay between checks for expired nicks and channels */ + time_t ExpireTimeout; + /* How long to wait for something from the uplink, this is passed to select() */ + time_t ReadTimeout; + /* How often to send program errors */ + time_t WarningTimeout; + /* How long to process things such as timers to see if there is anything to calll */ + time_t TimeoutCheck; + /* Num of days logfiles are kept */ + int KeepLogs; + /* Number of days backups are kept */ + int KeepBackups; + /* Forbidding requires a reason */ + bool ForceForbidReason; + /* Services should use privmsgs instead of notices */ + bool UsePrivmsg; + /* Services only respond to full PRIVMSG client@services.server.name messaegs */ + bool UseStrictPrivMsg; + /* Dump a core file if we crash */ + bool DumpCore; + /* Log users connecting/existing/changing nicks */ + bool LogUsers; + /* Number of seconds between consecutive uses of the REGISTER command + * Not to be confused with NSRegDelay */ + unsigned NickRegDelay; + /* Max number if news items allowed in the list */ + unsigned NewsCount; + + /* Services can use email */ + bool UseMail; + /* Path to the sendmail executable */ + char *SendMailPath; + /* Address to send from */ + char *SendFrom; + /* Only opers can have services send mail */ + bool RestrictMail; + /* Delay between sending mail */ + time_t MailDelay; + /* Don't quote the To: address */ + bool DontQuoteAddresses; + + /* Prefix of guest nicks when a user gets forced off of a nick */ + char *NSGuestNickPrefix; + /* Allow users to set kill immed on */ + bool NSAllowKillImmed; + /* Don't allow nicks to use /ns group to regroup nicks */ + bool NSNoGroupChange; + /* Default flags for newly registered nicks */ + Flags<NickCoreFlag> NSDefFlags; + /* Default language used by services */ + unsigned NSDefLanguage; + /* Users must be connected this long before they can register + * Not to be confused with NickRegDelay */ + time_t NSRegDelay; + /* Time before the registering mail will be resent */ + time_t NSResendDelay; + /* How long before nicks expir */ + time_t NSExpire; + /* Time before NickRequests expire */ + time_t NSRExpire; + /* Force email when registering */ + bool NSForceEmail; + /* Max number of nicks in a group */ + int NSMaxAliases; + /* Max number of allowed strings on the access list */ + unsigned NSAccessMax; + /* Enforcer client user name */ + char *NSEnforcerUser; + /* Enforcer client hostname */ + char *NSEnforcerHost; + /* How long before recovered nicks are released */ + time_t NSReleaseTimeout; + /* /nickserv list is oper only */ + bool NSListOpersOnly; + /* Max number of entries that can be returned from the list command */ + unsigned NSListMax; + /* Only allow usermode +a etc on real services admins */ + bool NSSecureAdmins; + /* Services opers must be /operd on the ircd aswell */ + bool NSStrictPrivileges; + /* Use email to verify new users registering */ + bool NSEmailReg; + /* Set the proper channel modes on users when they identify */ + bool NSModeOnID; + /* Add the users hostnask their access list when they register */ + bool NSAddAccessOnReg; + + /* Default flags for newly registered channels */ + Flags<ChannelInfoFlag> CSDefFlags; + /* Max number of channels a user can own */ + unsigned CSMaxReg; + /* Time before a channel expires */ + time_t CSExpire; + /* Default ban type to use for channels */ + int CSDefBantype; + /* Max number of entries allowed on channel access lists */ + unsigned CSAccessMax; + /* Max number of entries allowed on autokick lists */ + unsigned CSAutokickMax; + /* Default autokick reason */ + char *CSAutokickReason; + /* Time ChanServ should stay in the channel to hold it to keep users from getting in */ + time_t CSInhabit; + /* ChanServ's LIST command is oper only */ + bool CSListOpersOnly; + /* Max number of entries allowed to be returned from the LIST command */ + unsigned CSListMax; + /* true to make ChanServ oper only */ + bool CSOpersOnly; + + /* Max number of memos allowed */ + unsigned MSMaxMemos; + /* Time you must wait between sending memos */ + time_t MSSendDelay; + /* Notify all of the aliases of the core the memo was sent to */ + bool MSNotifyAll; + /* Who can use memos reciepts */ + unsigned MSMemoReceipt; + + /* Defai;t BotServ flags */ + Flags<BotServFlag> BSDefFlags; + /* How long before botserv forgets a user. This is used for flood kickers etc */ + time_t BSKeepData; + /* Min number of users to have in the channel before the service bot joins */ + unsigned BSMinUsers; + /* Max number of words allowed on the badwordslist */ + unsigned BSBadWordsMax; + /* BotServ bot only joins if it would normally allowed to, abides by bans etc */ + bool BSSmartJoin; + /* Dont tell users what badword they used */ + bool BSGentleBWReason; + /* Case sensitive badwords matching */ + bool BSCaseSensitive; + /* Char to use for the fantasy char, eg ! */ + char *BSFantasyCharacter; + + /* Only show /stats o to opers */ + bool HideStatsO; + /* Send out a global when services shut down or restart */ + bool GlobalOnCycle; + /* Don't include the opers name in globals */ + bool AnonymousGlobal; + /* Dont allow users to register nicks with oper names in them */ + bool RestrictOperNicks; + /* Message to send when shutting down */ + char *GlobalOnCycleMessage; + /* Message to send when starting up */ + char *GlobalOnCycleUP; + /* Super admin is allowed */ + bool SuperAdmin; + /* Log things said through ACT/SAY */ + bool LogBot; + /* Log when new user max is reached */ + bool LogMaxUsers; + /* Default expiry time for akills */ + time_t AutokillExpiry; + /* Default expiry time for chan kills */ + time_t ChankillExpiry; + /* Default expiry time for SGLine Expire */ + time_t SGLineExpiry; + /* Default expiry time for SQLines */ + time_t SQLineExpiry; + /* Default expiry time for SZLine */ + time_t SZLineExpiry; + /* Actually akill the user when the akill is added */ + bool AkillOnAdd; + /* Kill users on SGline */ + bool KillonSGline; + /* Kill users on SQline */ + bool KillonSQline; + /* Send a WALLOPS/GLOBOPS when a user opers */ + bool WallOper; + /* Send a WALLOPS/GLOBOPS when a nonoper tries to use OperServ */ + bool WallBadOS; + /* Send a WALLOPS/GLOBOPS when someone uses the GLOBAL command */ + bool WallOSGlobal; + /* Send a WALLOPS/GLOBOPS when someone uses the MODE command */ + bool WallOSMode; + /* Send a WALLOPS/GLOBOPS when someone uses the CLEARMODES command */ + bool WallOSClearmodes; + /* Send a WALLOPS/GLOBOPS when someone uses the KICK command */ + bool WallOSKick; + /* Send a WALLOPS/GLOBOPS when someone uses the AKILL command */ + bool WallOSAkill; + /* Send a WALLOPS/GLOBOPS when someone uses the SGLINE command */ + bool WallOSSGLine; + /* Send a WALLOPS/GLOBOPS when someone uses the SQLINE command */ + bool WallOSSQLine; + /* Send a WALLOPS/GLOBOPS when someone uses the SZLINE command */ + bool WallOSSZLine; + /* Send a WALLOPS/GLOBOPS when someone uses the NOOP command */ + bool WallOSNoOp; + /* Send a WALLOPS/GLOBOPS when when someone uses the JUPE command */ + bool WallOSJupe; + /* Send a WALLOPS/GLOBOPS when an akill expires */ + bool WallAkillExpire; + /* Send a WALLOPS/GLOBOPS when SGLines expire */ + bool WallSGLineExpire; + /* Send a WALLOPS/GLOBOPS when SQLines expire */ + bool WallSQLineExpire; + /* Send a WALLOPS/GLOBOPS when SZLines expire */ + bool WallSZLineExpire; + /* Send a WALLOPS/GLOBOPS when exceptions expire */ + bool WallExceptionExpire; + /* Send a WALLOPS/GLOBOPS when DROP is used */ + bool WallDrop; + /* Send a WALLOPS/GLOBOPS when FORBID is used */ + bool WallForbid; + /* Send a WALLOPS/GLOBOPS when GETPASS is used */ + bool WallGetpass; + /* Send a WALLOPS/GLOBOPS when SETPASS is used */ + bool WallSetpass; + /* Add the akillers nick to the akill reason */ + bool AddAkiller; + + /* Limit sessions */ + bool LimitSessions; + /* The default session limit */ + unsigned DefSessionLimit; + /* How long before exceptions expire */ + time_t ExceptionExpiry; + /* How many times to kill before adding an KILL */ + int MaxSessionKill; + /* Max limit that can be used for exceptions */ + unsigned MaxSessionLimit; + /* How long session akills should last */ + time_t SessionAutoKillExpiry; + /* DB name for exceptions */ + char *ExceptionDBName; + /* Reason to use for session kills */ + char *SessionLimitExceeded; + /* Optional second reason */ + char *SessionLimitDetailsLoc; + /* OperServ requires you to be an operator */ + bool OSOpersOnly; + + /* List of modules to autoload */ + std::list<std::string> ModulesAutoLoad; + /* Encryption modules */ + std::list<std::string> EncModuleList; + /* HostServ Core Modules */ + std::list<std::string> HostServCoreModules; + /* MemoServ Core Modules */ + std::list<std::string> MemoServCoreModules; + /* BotServ Core Modules */ + std::list<std::string> BotServCoreModules; + /* OperServ Core Modules */ + std::list<std::string> OperServCoreModules; + /* NickServ Core Modules */ + std::list<std::string> NickServCoreModules; + /* ChanServ Core Modules */ + std::list<std::string> ChanServCoreModules; + + /* Default defcon level */ + int DefConLevel; + /* Timeout before defcon is reset */ + time_t DefConTimeOut; + /* Session limiit to use when using defcon */ + int DefConSessionLimit; + /* How long to add akills for defcon */ + time_t DefConAKILL; + /* Chan modes for defcon */ + char *DefConChanModes; + /* Should we global on defcon */ + bool GlobalOnDefcon; + /* Should we send DefconMessage aswell? */ + bool GlobalOnDefconMore; + /* Message to send when defcon is off */ + char *DefConOffMessage; + /* Message to send when defcon is on*/ + char *DefconMessage; + /* Reason to akill clients for defcon */ + char *DefConAkillReason; + + /* User keys to use for generating random hashes for pass codes etc */ + long unsigned int UserKey1; + long unsigned int UserKey2; + long unsigned int UserKey3; + + /* Numeric */ + char *Numeric; + /* Array of ulined servers */ + char **Ulines; + /* Number of ulines */ + int NumUlines; + + /* List of available opertypes */ + std::list<OperType *> MyOperTypes; + /* List of pairs of opers and their opertype from the config */ + std::list<std::pair<std::string, std::string> > Opers; }; /** This class can be used on its own to represent an exception, or derived to represent a module-specific exception. diff --git a/include/extern.h b/include/extern.h index e6005b4e8..348489a40 100644 --- a/include/extern.h +++ b/include/extern.h @@ -31,7 +31,6 @@ E char *uplink; E IRCDVar *ircd; E IRCDCAPAB *ircdcap; E int UseTSMODE; /* hack to get around bahamut clones that don't send TSMODE */ -E char *IRCDModule; E IRCDProto *ircdproto; /**** actions.c ****/ @@ -121,7 +120,7 @@ E Entry *elist_find_mask(EList *list, const char *mask); E long get_memuse(EList *list); -#define whosends(ci) ((!(ci) || !((ci)->botflags.HasFlag(BS_SYMBIOSIS)) || !(ci)->bi || !(ci)->c || (ci)->c->usercount < BSMinUsers) ? findbot(s_ChanServ) : (ci)->bi) +#define whosends(ci) ((!(ci) || !((ci)->botflags.HasFlag(BS_SYMBIOSIS)) || !(ci)->bi || !(ci)->c || (ci)->c->usercount < Config.BSMinUsers) ? findbot(Config.s_ChanServ) : (ci)->bi) /**** chanserv.c ****/ @@ -178,212 +177,16 @@ char *sockstrerror(int error); /**** config.c ****/ -E ServerConfig serverConfig; - -E std::list<Uplink *> Uplinks; -E char *LocalHost; -E unsigned LocalPort; - -E char *ServerName; -E char *ServerDesc; -E char *ServiceUser; -E char *ServiceHost; - -E char *HelpChannel; -E char *LogChannel; -E char *NetworkName; -E unsigned NickLen; - -E char *s_NickServ; -E char *s_ChanServ; -E char *s_MemoServ; -E char *s_BotServ; -E char *s_OperServ; -E char *s_GlobalNoticer; -E char *desc_NickServ; -E char *desc_ChanServ; -E char *desc_MemoServ; -E char *desc_BotServ; -E char *desc_OperServ; -E char *desc_GlobalNoticer; - -E char *HostDBName; -E char *desc_HostServ; -E char *s_HostServ; +E ServerConfig Config; + E void load_hs_dbase(); E void save_hs_dbase(); E int do_on_id(User * u); E void delHostCore(const char *nick); E void hostserv(User * u, char *buf); -E char *PIDFilename; -E char *MOTDFilename; -E char *NickDBName; -E char *PreNickDBName; -E char *ChanDBName; -E char *BotDBName; -E char *OperDBName; -E char *NewsDBName; - -E bool NoBackupOkay; -E bool StrictPasswords; -E unsigned BadPassLimit; -E time_t BadPassTimeout; -E time_t UpdateTimeout; -E time_t ExpireTimeout; -E time_t ReadTimeout; -E time_t WarningTimeout; -E time_t TimeoutCheck; -E int KeepLogs; -E int KeepBackups; -E bool ForceForbidReason; -E bool UsePrivmsg; -E bool UseStrictPrivMsg; -E bool DumpCore; -E bool LogUsers; -E unsigned NickRegDelay; -E bool RestrictOperNicks; -E unsigned NewsCount; -E char *Numeric; - -E bool UseMail; -E char *SendMailPath; -E char *SendFrom; -E bool RestrictMail; -E time_t MailDelay; -E bool DontQuoteAddresses; - -E Flags<NickCoreFlag> NSDefFlags; -E unsigned NSDefLanguage; -E time_t NSRegDelay; -E time_t NSResendDelay; -E time_t NSExpire; -E time_t NSRExpire; -E bool NSForceEmail; -E int NSMaxAliases; -E unsigned NSAccessMax; -E char *NSEnforcerUser; -E char *NSEnforcerHost; -E time_t NSReleaseTimeout; -E bool NSAllowKillImmed; -E bool NSNoGroupChange; -E bool NSListOpersOnly; -E unsigned NSListMax; -E char *NSGuestNickPrefix; -E bool NSSecureAdmins; -E bool NSStrictPrivileges; -E bool NSEmailReg; -E bool NSModeOnID; -E bool NSAddAccessOnReg; - -E Flags<ChannelInfoFlag> CSDefFlags; -E unsigned CSMaxReg; -E time_t CSExpire; -E int CSDefBantype; -E unsigned CSAccessMax; -E unsigned CSAutokickMax; -E char *CSAutokickReason; -E time_t CSInhabit; -E bool CSListOpersOnly; -E unsigned CSListMax; -E bool CSRestrictGetPass; -E bool CSOpersOnly; - -E unsigned MSMaxMemos; -E time_t MSSendDelay; -E bool MSNotifyAll; -E unsigned MSMemoReceipt; - -E Flags<BotServFlag> BSDefFlags; -E time_t BSKeepData; -E unsigned BSMinUsers; -E unsigned BSBadWordsMax; -E bool BSSmartJoin; -E bool BSGentleBWReason; -E bool BSCaseSensitive; -E char *BSFantasyCharacter; - -E bool HideStatsO; -E bool GlobalOnCycle; -E bool AnonymousGlobal; -E char *GlobalOnCycleMessage; -E char *GlobalOnCycleUP; -E bool LogMaxUsers; -E bool SuperAdmin; -E bool LogBot; -E time_t AutokillExpiry; -E time_t ChankillExpiry; -E time_t SGLineExpiry; -E time_t SQLineExpiry; -E time_t SZLineExpiry; -E bool AkillOnAdd; -E bool KillonSGline; -E bool KillonSQline; -E bool WallOper; -E bool WallBadOS; -E bool WallOSGlobal; -E bool WallOSMode; -E bool WallOSClearmodes; -E bool WallOSKick; -E bool WallOSAkill; -E bool WallOSSGLine; -E bool WallOSSQLine; -E bool WallOSSZLine; -E bool WallOSNoOp; -E bool WallOSJupe; -E bool WallAkillExpire; -E bool WallSGLineExpire; -E bool WallSQLineExpire; -E bool WallSZLineExpire; -E bool WallExceptionExpire; -E bool WallDrop; -E bool WallForbid; -E bool WallGetpass; -E bool WallSetpass; -E bool AddAkiller; - -/** - * Modules Stuff - **/ -E std::list<std::string> ModulesAutoLoad; - -E std::list<std::string> EncModuleList; -E std::list<std::string> HostServCoreModules; -E std::list<std::string> MemoServCoreModules; -E std::list<std::string> BotServCoreModules; -E std::list<std::string> OperServCoreModules; -E std::list<std::string> NickServCoreModules; -E std::list<std::string> ChanServCoreModules; - -E bool LimitSessions; -E unsigned DefSessionLimit; -E time_t ExceptionExpiry; -E int MaxSessionKill; -E unsigned MaxSessionLimit; -E time_t SessionAutoKillExpiry; -E char *ExceptionDBName; -E char *SessionLimitDetailsLoc; -E char *SessionLimitExceeded; - -E char **Ulines; -E int NumUlines; - E int read_config(int reload); -E int DefConLevel; -E int DefConSessionLimit; -E time_t DefConTimeOut; -E time_t DefConAKILL; -E char *DefConChanModes; -E bool GlobalOnDefcon; -E bool GlobalOnDefconMore; -E char *DefconMessage; -E char *DefConAkillReason; -E char *DefConOffMessage; - -E long unsigned int UserKey1; -E long unsigned int UserKey2; -E long unsigned int UserKey3; /**** converter.c ****/ E int convert_ircservices_44(); @@ -683,8 +486,6 @@ E void AddDefCon(int level, DefconLevel Level); E void DelDefCon(int level, DefconLevel Level); E std::vector<std::bitset<32> > DefCon; -E bool OSOpersOnly; - /**** process.c ****/ E int allow_ignore; diff --git a/include/services.h b/include/services.h index f8e48aa8a..6901c61b0 100644 --- a/include/services.h +++ b/include/services.h @@ -1767,16 +1767,6 @@ class CoreExport Anope /*************************************************************************/ -/** Pair of nick/opertype lookup. It's stored like this currently, because config is parsed before db load. - * XXX: It would be nice to not need this. UGH. - */ -E std::list<std::pair<std::string, std::string> > svsopers_in_config; -/** List of available opertypes. - */ -E std::list<OperType *> MyOperTypes; - -/*************************************************************************/ - #include "timers.h" /** Timer for colliding nicks to force people off of nicknames diff --git a/src/actions.c b/src/actions.c index f6b8c7675..9ed6b3b72 100644 --- a/src/actions.c +++ b/src/actions.c @@ -26,16 +26,16 @@ void bad_password(User * u) { time_t now = time(NULL); - if (!u || !BadPassLimit) { + if (!u || !Config.BadPassLimit) { return; } - if (BadPassTimeout > 0 && u->invalid_pw_time > 0 - && u->invalid_pw_time < now - BadPassTimeout) + if (Config.BadPassTimeout > 0 && u->invalid_pw_time > 0 + && u->invalid_pw_time < now - Config.BadPassTimeout) u->invalid_pw_count = 0; u->invalid_pw_count++; u->invalid_pw_time = now; - if (u->invalid_pw_count >= BadPassLimit) { + if (u->invalid_pw_count >= Config.BadPassLimit) { kill_user(NULL, u->nick, "Too many invalid passwords"); } } @@ -57,7 +57,7 @@ void kill_user(const char *source, const char *user, const char *reason) return; } if (!source || !*source) { - source = ServerName; + source = Config.ServerName; } if (!reason) { reason = ""; @@ -106,9 +106,9 @@ void sqline(char *mask, char *reason) av[0] = c->name; av[1] = cu->user->nick; av[2] = reason; - ircdproto->SendKick(findbot(s_OperServ), av[0], av[1], + ircdproto->SendKick(findbot(Config.s_OperServ), av[0], av[1], "Q-Lined: %s", av[2]); - do_kick(s_ChanServ, 3, av); + do_kick(Config.s_ChanServ, 3, av); } } } diff --git a/src/bots.cpp b/src/bots.cpp index 6d7728a93..db236c175 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -21,19 +21,19 @@ BotInfo::BotInfo(const char *nnick) this->cmdTable = NULL; this->chancount = 0; - if (s_ChanServ && !stricmp(s_ChanServ, nnick)) + if (Config.s_ChanServ && !stricmp(Config.s_ChanServ, nnick)) this->SetFlag(BI_CHANSERV); - else if (s_BotServ && !stricmp(s_BotServ, nnick)) + else if (Config.s_BotServ && !stricmp(Config.s_BotServ, nnick)) this->SetFlag(BI_BOTSERV); - else if (s_HostServ && !stricmp(s_HostServ, nnick)) + else if (Config.s_HostServ && !stricmp(Config.s_HostServ, nnick)) this->SetFlag(BI_HOSTSERV); - else if (s_OperServ && !stricmp(s_OperServ, nnick)) + else if (Config.s_OperServ && !stricmp(Config.s_OperServ, nnick)) this->SetFlag(BI_OPERSERV); - else if (s_MemoServ && !stricmp(s_MemoServ, nnick)) + else if (Config.s_MemoServ && !stricmp(Config.s_MemoServ, nnick)) this->SetFlag(BI_MEMOSERV); - else if (s_NickServ && !stricmp(s_NickServ, nnick)) + else if (Config.s_NickServ && !stricmp(Config.s_NickServ, nnick)) this->SetFlag(BI_NICKSERV); - else if (s_GlobalNoticer && !stricmp(s_GlobalNoticer, nnick)) + else if (Config.s_GlobalNoticer && !stricmp(Config.s_GlobalNoticer, nnick)) this->SetFlag(BI_GLOBAL); FOREACH_MOD(I_OnBotPreLoad, OnBotPreLoad(this)); @@ -58,19 +58,19 @@ BotInfo::BotInfo(const char *nnick, const char *nuser, const char *nhost, const this->cmdTable = NULL; this->chancount = 0; - if (s_ChanServ && !stricmp(s_ChanServ, nnick)) + if (Config.s_ChanServ && !stricmp(Config.s_ChanServ, nnick)) this->SetFlag(BI_CHANSERV); - else if (s_BotServ && !stricmp(s_BotServ, nnick)) + else if (Config.s_BotServ && !stricmp(Config.s_BotServ, nnick)) this->SetFlag(BI_BOTSERV); - else if (s_HostServ && !stricmp(s_HostServ, nnick)) + else if (Config.s_HostServ && !stricmp(Config.s_HostServ, nnick)) this->SetFlag(BI_HOSTSERV); - else if (s_OperServ && !stricmp(s_OperServ, nnick)) + else if (Config.s_OperServ && !stricmp(Config.s_OperServ, nnick)) this->SetFlag(BI_OPERSERV); - else if (s_MemoServ && !stricmp(s_MemoServ, nnick)) + else if (Config.s_MemoServ && !stricmp(Config.s_MemoServ, nnick)) this->SetFlag(BI_MEMOSERV); - else if (s_NickServ && !stricmp(s_NickServ, nnick)) + else if (Config.s_NickServ && !stricmp(Config.s_NickServ, nnick)) this->SetFlag(BI_NICKSERV); - else if (s_GlobalNoticer && !stricmp(s_GlobalNoticer, nnick)) + else if (Config.s_GlobalNoticer && !stricmp(Config.s_GlobalNoticer, nnick)) this->SetFlag(BI_GLOBAL); FOREACH_MOD(I_OnBotPreLoad, OnBotPreLoad(this)); @@ -132,7 +132,7 @@ void BotInfo::RejoinAll() for (i = 0; i < 256; i++) for (ci = chanlists[i]; ci; ci = ci->next) - if (ci->bi == this && ci->c && (ci->c->usercount >= BSMinUsers)) + if (ci->bi == this && ci->c && (ci->c->usercount >= Config.BSMinUsers)) bot_join(ci); } @@ -153,7 +153,7 @@ void BotInfo::Assign(User *u, ChannelInfo *ci) ci->bi = this; this->chancount++; - if (ci->c && ci->c->usercount >= BSMinUsers) + if (ci->c && ci->c->usercount >= Config.BSMinUsers) bot_join(ci); } @@ -164,7 +164,7 @@ void BotInfo::UnAssign(User *u, ChannelInfo *ci) if (MOD_RESULT == EVENT_STOP) return; - if (ci->c && ci->c->usercount >= BSMinUsers) + if (ci->c && ci->c->usercount >= Config.BSMinUsers) { if (u) ircdproto->SendPart(ci->bi, ci->name, "UNASSIGN from %s", u->nick); diff --git a/src/botserv.c b/src/botserv.c index 7c1657187..0919df3aa 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -34,7 +34,7 @@ E void moduleAddBotServCmds(); /*************************************************************************/ /* *INDENT-OFF* */ void moduleAddBotServCmds() { - ModuleManager::LoadModuleList(BotServCoreModules); + ModuleManager::LoadModuleList(Config.BotServCoreModules); } /* *INDENT-ON* */ /*************************************************************************/ @@ -70,7 +70,7 @@ void get_botserv_stats(long *nrec, long *memuse) void bs_init() { - if (s_BotServ) { + if (Config.s_BotServ) { moduleAddBotServCmds(); } } @@ -91,9 +91,9 @@ void botserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { *s = 0; } - ircdproto->SendCTCP(findbot(s_BotServ), u->nick, "PING %s", s); + ircdproto->SendCTCP(findbot(Config.s_BotServ), u->nick, "PING %s", s); } else { - mod_run_cmd(s_BotServ, u, BOTSERV, cmd); + mod_run_cmd(Config.s_BotServ, u, BOTSERV, cmd); } } @@ -244,21 +244,21 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) bw = ci->GetBadWord(i); if (bw->type == BW_ANY - && ((BSCaseSensitive && strstr(nbuf, bw->word.c_str())) - || (!BSCaseSensitive && stristr(nbuf, bw->word.c_str())))) { + && ((Config.BSCaseSensitive && strstr(nbuf, bw->word.c_str())) + || (!Config.BSCaseSensitive && stristr(nbuf, bw->word.c_str())))) { mustkick = 1; } else if (bw->type == BW_SINGLE) { int len = bw->word.length(); - if ((BSCaseSensitive && nbuf == bw->word) - || (!BSCaseSensitive + if ((Config.BSCaseSensitive && nbuf == bw->word) + || (!Config.BSCaseSensitive && (!stricmp(nbuf, bw->word.c_str())))) { mustkick = 1; /* two next if are quite odd isn't it? =) */ } else if ((strchr(nbuf, ' ') == nbuf + len) && - ((BSCaseSensitive && nbuf == bw->word) - || (!BSCaseSensitive + ((Config.BSCaseSensitive && nbuf == bw->word) + || (!Config.BSCaseSensitive && (stristr(nbuf, bw->word.c_str()) == nbuf)))) { mustkick = 1; @@ -266,10 +266,10 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) if ((strrchr(nbuf, ' ') == nbuf + strlen(nbuf) - len - 1) && - ((BSCaseSensitive + ((Config.BSCaseSensitive && (strstr(nbuf, bw->word.c_str()) == nbuf + strlen(nbuf) - len)) - || (!BSCaseSensitive + || (!Config.BSCaseSensitive && (stristr(nbuf, bw->word.c_str()) == nbuf + strlen(nbuf) - len)))) { mustkick = 1; @@ -281,9 +281,9 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) wordbuf[len + 2] = '\0'; memcpy(wordbuf + 1, bw->word.c_str(), len); - if ((BSCaseSensitive + if ((Config.BSCaseSensitive && (strstr(nbuf, wordbuf))) - || (!BSCaseSensitive + || (!Config.BSCaseSensitive && (stristr(nbuf, wordbuf)))) { mustkick = 1; } @@ -295,9 +295,9 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) } else if (bw->type == BW_START) { int len = bw->word.length(); - if ((BSCaseSensitive + if ((Config.BSCaseSensitive && (!strncmp(nbuf, bw->word.c_str(), len))) - || (!BSCaseSensitive + || (!Config.BSCaseSensitive && (!strnicmp(nbuf, bw->word.c_str(), len)))) { mustkick = 1; } else { @@ -307,8 +307,8 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) wordbuf[0] = ' '; wordbuf[len + 1] = '\0'; - if ((BSCaseSensitive && (strstr(nbuf, wordbuf))) - || (!BSCaseSensitive + if ((Config.BSCaseSensitive && (strstr(nbuf, wordbuf))) + || (!Config.BSCaseSensitive && (stristr(nbuf, wordbuf)))) mustkick = 1; @@ -317,11 +317,11 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) } else if (bw->type == BW_END) { int len = bw->word.length(); - if ((BSCaseSensitive + if ((Config.BSCaseSensitive && (!strncmp (nbuf + strlen(nbuf) - len, bw->word.c_str(), len))) - || (!BSCaseSensitive + || (!Config.BSCaseSensitive && (!strnicmp (nbuf + strlen(nbuf) - len, bw->word.c_str(), @@ -334,8 +334,8 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) wordbuf[len] = ' '; wordbuf[len + 1] = '\0'; - if ((BSCaseSensitive && (strstr(nbuf, wordbuf))) - || (!BSCaseSensitive + if ((Config.BSCaseSensitive && (strstr(nbuf, wordbuf))) + || (!Config.BSCaseSensitive && (stristr(nbuf, wordbuf)))) mustkick = 1; @@ -345,7 +345,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) if (mustkick) { check_ban(ci, u, TTB_BADWORDS); - if (BSGentleBWReason) + if (Config.BSGentleBWReason) bot_kick(ci, u, BOT_REASON_BADWORD_GENTLE); else bot_kick(ci, u, BOT_REASON_BADWORD, bw->word.c_str()); @@ -415,10 +415,10 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) /* Fantaisist commands */ - if (buf && ci->botflags.HasFlag(BS_FANTASY) && *buf == *BSFantasyCharacter && !was_action) { + if (buf && ci->botflags.HasFlag(BS_FANTASY) && *buf == *Config.BSFantasyCharacter && !was_action) { cmd = strtok(buf, " "); - if (cmd && (cmd[0] == *BSFantasyCharacter)) { + if (cmd && (cmd[0] == *Config.BSFantasyCharacter)) { char *params = strtok(NULL, ""); /* Strip off the fantasy character */ @@ -467,7 +467,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) #define SAFE(x) do { \ if ((x) < 0) { \ if (!forceload) \ - fatal("Read error on %s", BotDBName); \ + fatal("Read error on %s", Config.BotDBName); \ failed = 1; \ break; \ } \ @@ -482,7 +482,7 @@ void load_bs_dbase() BotInfo *bi; int failed = 0; - if (!(f = open_db(s_BotServ, BotDBName, "r", BOT_VERSION))) + if (!(f = open_db(Config.s_BotServ, Config.BotDBName, "r", BOT_VERSION))) return; ver = get_file_version(f); @@ -491,7 +491,7 @@ void load_bs_dbase() char *s; if (c != 1) - fatal("Invalid format in %s %d", BotDBName, c); + fatal("Invalid format in %s %d", Config.BotDBName, c); SAFE(read_string(&s, f)); bi = new BotInfo(s); @@ -512,20 +512,20 @@ void load_bs_dbase() * changed in the config and different from database * names */ - if (s_ChanServ && bi->HasFlag(BI_CHANSERV) && strcmp(bi->nick, s_ChanServ)) - bi->ChangeNick(s_ChanServ); - else if (s_BotServ && bi->HasFlag(BI_BOTSERV) && strcmp(bi->nick, s_BotServ)) - bi->ChangeNick(s_BotServ); - else if (s_HostServ && bi->HasFlag(BI_HOSTSERV) && strcmp(bi->nick, s_HostServ)) - bi->ChangeNick(s_HostServ); - else if (s_OperServ && bi->HasFlag(BI_OPERSERV) && strcmp(bi->nick, s_OperServ)) - bi->ChangeNick(s_OperServ); - else if (s_MemoServ && bi->HasFlag(BI_MEMOSERV) && strcmp(bi->nick, s_MemoServ)) - bi->ChangeNick(s_MemoServ); - else if (s_NickServ && bi->HasFlag(BI_NICKSERV) && strcmp(bi->nick, s_NickServ)) - bi->ChangeNick(s_NickServ); - else if (s_GlobalNoticer && bi->HasFlag(BI_GLOBAL) && strcmp(bi->nick, s_GlobalNoticer)) - bi->ChangeNick(s_GlobalNoticer); + if (Config.s_ChanServ && bi->HasFlag(BI_CHANSERV) && strcmp(bi->nick, Config.s_ChanServ)) + bi->ChangeNick(Config.s_ChanServ); + else if (Config.s_BotServ && bi->HasFlag(BI_BOTSERV) && strcmp(bi->nick, Config.s_BotServ)) + bi->ChangeNick(Config.s_BotServ); + else if (Config.s_HostServ && bi->HasFlag(BI_HOSTSERV) && strcmp(bi->nick, Config.s_HostServ)) + bi->ChangeNick(Config.s_HostServ); + else if (Config.s_OperServ && bi->HasFlag(BI_OPERSERV) && strcmp(bi->nick, Config.s_OperServ)) + bi->ChangeNick(Config.s_OperServ); + else if (Config.s_MemoServ && bi->HasFlag(BI_MEMOSERV) && strcmp(bi->nick, Config.s_MemoServ)) + bi->ChangeNick(Config.s_MemoServ); + else if (Config.s_NickServ && bi->HasFlag(BI_NICKSERV) && strcmp(bi->nick, Config.s_NickServ)) + bi->ChangeNick(Config.s_NickServ); + else if (Config.s_GlobalNoticer && bi->HasFlag(BI_GLOBAL) && strcmp(bi->nick, Config.s_GlobalNoticer)) + bi->ChangeNick(Config.s_GlobalNoticer); } close_db(f); @@ -538,9 +538,9 @@ void load_bs_dbase() #define SAFE(x) do { \ if ((x) < 0) { \ restore_db(f); \ - log_perror("Write error on %s", BotDBName); \ - if (time(NULL) - lastwarn > WarningTimeout) { \ - ircdproto->SendGlobops(NULL, "Write error on %s: %s", BotDBName, \ + log_perror("Write error on %s", Config.BotDBName); \ + if (time(NULL) - lastwarn > Config.WarningTimeout) { \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", Config.BotDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -555,7 +555,7 @@ void save_bs_dbase() static time_t lastwarn = 0; int i; - if (!(f = open_db(s_BotServ, BotDBName, "w", BOT_VERSION))) + if (!(f = open_db(Config.s_BotServ, Config.BotDBName, "w", BOT_VERSION))) return; for (i = 0; i < 256; i++) { @@ -647,7 +647,7 @@ static BanData *get_ban_data(Channel * c, User * u) u->GetDisplayedHost().c_str()); for (bd = c->bd; bd; bd = next) { - if (now - bd->last_use > BSKeepData) { + if (now - bd->last_use > Config.BSKeepData) { if (bd->next) bd->next->prev = bd->prev; if (bd->prev) @@ -702,7 +702,7 @@ static UserData *get_user_data(Channel * c, User * u) time_t now = time(NULL); /* Checks whether data is obsolete */ - if (now - user->ud->last_use > BSKeepData) { + if (now - user->ud->last_use > Config.BSKeepData) { if (user->ud->lastline) delete [] user->ud->lastline; /* We should not free and realloc, but reset to 0 @@ -736,7 +736,7 @@ void bot_join(ChannelInfo * ci) if (!ci || !ci->c || !ci->bi) return; - if (BSSmartJoin) { + if (Config.BSSmartJoin) { /* We check for bans */ if (ci->c->bans && ci->c->bans->count) { char buf[BUFSIZE]; diff --git a/src/channels.c b/src/channels.c index e6ee45430..b9d276a49 100644 --- a/src/channels.c +++ b/src/channels.c @@ -187,7 +187,7 @@ void Channel::RemoveMode(ChannelModeName Name) if (Name == CMODE_PERM && ci) { ci->UnsetFlag(CI_PERSIST); - if (s_BotServ && ci->bi && usercount == BSMinUsers - 1) + if (Config.s_BotServ && ci->bi && usercount == Config.BSMinUsers - 1) ircdproto->SendPart(ci->bi, name, NULL); if (!users) delete this; @@ -440,7 +440,7 @@ void chan_deluser(User * user, Channel * c) if (c->ci && c->ci->HasFlag(CI_PERSIST)) return; - if (s_BotServ && c->ci && c->ci->bi && c->usercount == BSMinUsers - 1) + if (Config.s_BotServ && c->ci && c->ci->bi && c->usercount == Config.BSMinUsers - 1) ircdproto->SendPart(c->ci->bi, c->name, NULL); if (!c->users) @@ -766,8 +766,8 @@ void chan_set_user_status(Channel * chan, User * user, int16 status) alog("debug: setting user status (%d) on %s for %s", status, user->nick, chan->name); - if (HelpChannel && ((um = ModeManager::FindUserModeByName(UMODE_HELPOP))) && (status & CUS_OP) - && (stricmp(chan->name, HelpChannel) == 0) + if (Config.HelpChannel && ((um = ModeManager::FindUserModeByName(UMODE_HELPOP))) && (status & CUS_OP) + && (stricmp(chan->name, Config.HelpChannel) == 0) && (!chan->ci || check_access(user, chan->ci, CA_AUTOOP))) { if (debug) { alog("debug: %s being given helpop for having %d status in %s", @@ -1044,7 +1044,7 @@ void do_kick(const char *source, int ac, const char **av) * channel and stop immediately. * --lara */ - if (s_BotServ && (bi = findbot(s)) && (ci = cs_findchan(av[0]))) { + if (Config.s_BotServ && (bi = findbot(s)) && (ci = cs_findchan(av[0]))) { bot_join(ci); continue; } @@ -1329,7 +1329,7 @@ void do_sjoin(const char *source, int ac, const char **av) } if (is_sqlined && !is_oper(user)) { - ircdproto->SendKick(findbot(s_OperServ), av[1], s, "Q-Lined"); + ircdproto->SendKick(findbot(Config.s_OperServ), av[1], s, "Q-Lined"); } else { if (!check_kick(user, av[1], ts)) { FOREACH_MOD(I_OnPreJoinChannel, OnPreJoinChannel(user, av[1])); @@ -1415,7 +1415,7 @@ void do_sjoin(const char *source, int ac, const char **av) } if (is_sqlined && !is_oper(user)) { - ircdproto->SendKick(findbot(s_OperServ), av[1], s, "Q-Lined"); + ircdproto->SendKick(findbot(Config.s_OperServ), av[1], s, "Q-Lined"); } else { if (!check_kick(user, av[1], ts)) { FOREACH_MOD(I_OnPreJoinChannel, OnPreJoinChannel(user, av[1])); @@ -1491,7 +1491,7 @@ void do_sjoin(const char *source, int ac, const char **av) } if (is_sqlined && !is_oper(user)) { - ircdproto->SendKick(findbot(s_OperServ), av[1], s, "Q-Lined"); + ircdproto->SendKick(findbot(Config.s_OperServ), av[1], s, "Q-Lined"); } else { if (!check_kick(user, av[1], ts)) { FOREACH_MOD(I_OnPreJoinChannel, OnPreJoinChannel(user, av[1])); @@ -1550,7 +1550,7 @@ void do_sjoin(const char *source, int ac, const char **av) } if (is_sqlined && !is_oper(user)) { - ircdproto->SendKick(findbot(s_OperServ), av[1], user->nick, "Q-Lined"); + ircdproto->SendKick(findbot(Config.s_OperServ), av[1], user->nick, "Q-Lined"); } else { FOREACH_MOD(I_OnPreJoinChannel, OnPreJoinChannel(user, av[1])); @@ -1910,10 +1910,10 @@ void chan_adduser2(User * user, Channel * c) if (c->ci && (check_access(user, c->ci, CA_MEMO)) && (c->ci->memos.memos.size() > 0)) { if (c->ci->memos.memos.size() == 1) { - notice_lang(s_MemoServ, user, MEMO_X_ONE_NOTICE, + notice_lang(Config.s_MemoServ, user, MEMO_X_ONE_NOTICE, c->ci->memos.memos.size(), c->ci->name); } else { - notice_lang(s_MemoServ, user, MEMO_X_MANY_NOTICE, + notice_lang(Config.s_MemoServ, user, MEMO_X_MANY_NOTICE, c->ci->memos.memos.size(), c->ci->name); } } @@ -1930,14 +1930,14 @@ void chan_adduser2(User * user, Channel * c) * legit users - Rob * But don't join the bot if the channel is persistant - Adam **/ - if (s_BotServ && c->ci && c->ci->bi && !c->ci->HasFlag(CI_PERSIST)) + if (Config.s_BotServ && c->ci && c->ci->bi && !c->ci->HasFlag(CI_PERSIST)) { - if (c->usercount == BSMinUsers) + if (c->usercount == Config.BSMinUsers) bot_join(c->ci); } - if (s_BotServ && c->ci && c->ci->bi) + if (Config.s_BotServ && c->ci && c->ci->bi) { - if (c->usercount >= BSMinUsers && (c->ci->botflags.HasFlag(BS_GREET)) + if (c->usercount >= Config.BSMinUsers && (c->ci->botflags.HasFlag(BS_GREET)) && user->nc && user->nc->greet && check_access(user, c->ci, CA_GREET)) { /* Only display the greet if the main uplink we're connected @@ -1978,7 +1978,7 @@ Channel *join_user_update(User * user, Channel * chan, const char *name, modes[0] = "-ov"; modes[1] = cu->user->nick; modes[2] = cu->user->nick; - chan_set_modes(s_OperServ, chan, 3, modes, 2); + chan_set_modes(Config.s_OperServ, chan, 3, modes, 2); } if (chan->ci) { @@ -2040,8 +2040,8 @@ void do_mass_mode(char *modes) delete [] myModes; return; } else { - ircdproto->SendMode(findbot(s_OperServ), c->name, "%s", modes); - chan_set_modes(s_OperServ, c, ac, av, 1); + ircdproto->SendMode(findbot(Config.s_OperServ), c->name, "%s", modes); + chan_set_modes(Config.s_OperServ, c, ac, av, 1); } } free(av); diff --git a/src/chanserv.c b/src/chanserv.c index 19ab774f1..e54ce75fd 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -113,7 +113,7 @@ int levelinfo_maxwidth = 0; /*************************************************************************/ void moduleAddChanServCmds() { - ModuleManager::LoadModuleList(ChanServCoreModules); + ModuleManager::LoadModuleList(Config.ChanServCoreModules); } /* *INDENT-ON* */ @@ -136,7 +136,7 @@ class ChanServTimer : public Timer if (ci) ci->UnsetFlag(CI_INHABIT); - ircdproto->SendPart(findbot(s_ChanServ), channel.c_str(), NULL); + ircdproto->SendPart(findbot(Config.s_ChanServ), channel.c_str(), NULL); } }; @@ -295,9 +295,9 @@ void chanserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { *s = 0; } - ircdproto->SendCTCP(findbot(s_ChanServ), u->nick, "PING %s", s); + ircdproto->SendCTCP(findbot(Config.s_ChanServ), u->nick, "PING %s", s); } else { - mod_run_cmd(s_ChanServ, u, CHANSERV, cmd); + mod_run_cmd(Config.s_ChanServ, u, CHANSERV, cmd); } } @@ -309,7 +309,7 @@ void chanserv(User * u, char *buf) #define SAFE(x) do { \ if ((x) < 0) { \ if (!forceload) \ - fatal("Read error on %s", ChanDBName); \ + fatal("Read error on %s", Config.ChanDBName); \ failed = 1; \ break; \ } \ @@ -323,7 +323,7 @@ void load_cs_dbase() ChannelInfo *ci, **last, *prev; int failed = 0; - if (!(f = open_db(s_ChanServ, ChanDBName, "r", CHAN_VERSION))) + if (!(f = open_db(Config.s_ChanServ, Config.ChanDBName, "r", CHAN_VERSION))) return; ver = get_file_version(f); @@ -343,7 +343,7 @@ void load_cs_dbase() prev = NULL; while ((c = getc_db(f)) != 0) { if (c != 1) - fatal("Invalid format in %s", ChanDBName); + fatal("Invalid format in %s", Config.ChanDBName); char channame[CHANMAX]; SAFE(read = read_buffer(channame, f)); ci = new ChannelInfo(channame); @@ -594,7 +594,7 @@ void load_cs_dbase() next = ci->next; if (!(ci->HasFlag(CI_FORBIDDEN)) && !ci->founder) { alog("%s: database load: Deleting founderless channel %s", - s_ChanServ, ci->name); + Config.s_ChanServ, ci->name); delete ci; continue; } @@ -609,9 +609,9 @@ void load_cs_dbase() #define SAFE(x) do { \ if ((x) < 0) { \ restore_db(f); \ - log_perror("Write error on %s", ChanDBName); \ - if (time(NULL) - lastwarn > WarningTimeout) { \ - ircdproto->SendGlobops(NULL, "Write error on %s: %s", ChanDBName, \ + log_perror("Write error on %s", Config.ChanDBName); \ + if (time(NULL) - lastwarn > Config.WarningTimeout) { \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", Config.ChanDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -627,7 +627,7 @@ void save_cs_dbase() static time_t lastwarn = 0; std::string param; - if (!(f = open_db(s_ChanServ, ChanDBName, "w", CHAN_VERSION))) + if (!(f = open_db(Config.s_ChanServ, Config.ChanDBName, "w", CHAN_VERSION))) return; for (i = 0; i < 256; i++) { @@ -806,7 +806,7 @@ void check_modes(Channel * c) if (c->server_modecount >= 3 && c->chanserv_modecount >= 3) { ircdproto->SendGlobops(NULL, "Warning: unable to set modes on channel %s. Are your servers' U:lines configured correctly?", c->name); - alog("%s: Bouncy modes on channel %s", s_ChanServ, c->name); + alog("%s: Bouncy modes on channel %s", Config.s_ChanServ, c->name); c->bouncy_modes = 1; return; } @@ -911,7 +911,7 @@ void check_modes(Channel * c) if (modebuf.empty()) return; - ircdproto->SendMode((ci ? whosends(ci) : findbot(s_OperServ)), c->name, "%s%s", modebuf.c_str(), argbuf.empty() ? "" : argbuf.c_str()); + ircdproto->SendMode((ci ? whosends(ci) : findbot(Config.s_OperServ)), c->name, "%s%s", modebuf.c_str(), argbuf.empty() ? "" : argbuf.c_str()); } /*************************************************************************/ @@ -931,7 +931,7 @@ int check_valid_admin(User * user, Channel * chan, int servermode) return 0; if (servermode && !check_access(user, chan->ci, CA_AUTOPROTECT)) { - notice_lang(s_ChanServ, user, CHAN_IS_REGISTERED, s_ChanServ); + notice_lang(Config.s_ChanServ, user, CHAN_IS_REGISTERED, Config.s_ChanServ); ircdproto->SendMode(whosends(chan->ci), chan->name, "-%s %s", cm->ModeChar, user->nick); return 0; @@ -967,7 +967,7 @@ int check_valid_op(User * user, Channel * chan, int servermode) halfop = ModeManager::FindChannelModeByName(CMODE_HALFOP); if (servermode && !check_access(user, chan->ci, CA_AUTOOP)) { - notice_lang(s_ChanServ, user, CHAN_IS_REGISTERED, s_ChanServ); + notice_lang(Config.s_ChanServ, user, CHAN_IS_REGISTERED, Config.s_ChanServ); if (halfop) { if (owner && protect) @@ -1214,7 +1214,7 @@ int check_kick(User * user, const char *chan, time_t chants) get_idealban(ci, user, mask, sizeof(mask)); else strlcpy(mask, akick->mask.c_str(), sizeof(mask)); - reason = !akick->reason.empty() ? akick->reason.c_str() : CSAutokickReason; + reason = !akick->reason.empty() ? akick->reason.c_str() : Config.CSAutokickReason; goto kick; } } @@ -1241,16 +1241,16 @@ int check_kick(User * user, const char *chan, time_t chants) * c may be NULL even if it exists */ if ((!(c = findchan(chan)) || c->usercount == 0) && !ci->HasFlag(CI_INHABIT)) { - ircdproto->SendJoin(findbot(s_ChanServ), chan, (c ? c->creation_time : chants)); + ircdproto->SendJoin(findbot(Config.s_ChanServ), chan, (c ? c->creation_time : chants)); /* * If channel was forbidden, etc, set it +si to prevent rejoin */ if (set_modes) { - ircdproto->SendMode(findbot(s_ChanServ), chan, "+ntsi"); + ircdproto->SendMode(findbot(Config.s_ChanServ), chan, "+ntsi"); } - t = new ChanServTimer(CSInhabit, chan); + t = new ChanServTimer(Config.CSInhabit, chan); ci->SetFlag(CI_INHABIT); } @@ -1339,16 +1339,16 @@ void restore_topic(const char *chan) strscpy(c->topic_setter, whosends(ci)->nick, NICKMAX); } if (ircd->join2set) { - if (whosends(ci) == findbot(s_ChanServ)) { - ircdproto->SendJoin(findbot(s_ChanServ), chan, c->creation_time); - ircdproto->SendMode(NULL, chan, "+o %s", s_ChanServ); + if (whosends(ci) == findbot(Config.s_ChanServ)) { + ircdproto->SendJoin(findbot(Config.s_ChanServ), chan, c->creation_time); + ircdproto->SendMode(NULL, chan, "+o %s", Config.s_ChanServ); } } ircdproto->SendTopic(whosends(ci), c->name, c->topic_setter, c->topic ? c->topic : "", c->topic_time); if (ircd->join2set) { - if (whosends(ci) == findbot(s_ChanServ)) { - ircdproto->SendPart(findbot(s_ChanServ), c->name, NULL); + if (whosends(ci) == findbot(Config.s_ChanServ)) { + ircdproto->SendPart(findbot(Config.s_ChanServ), c->name, NULL); } } } @@ -1380,7 +1380,7 @@ int check_topiclock(Channel * c, time_t topic_time) } else { c->topic = NULL; /* Bot assigned & Symbiosis ON?, the bot will set the topic - doc */ - /* Altough whosends() also checks for BSMinUsers -GD */ + /* Altough whosends() also checks for Config.BSMinUsers -GD */ strscpy(c->topic_setter, whosends(ci)->nick, NICKMAX); } @@ -1401,9 +1401,9 @@ int check_topiclock(Channel * c, time_t topic_time) } 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); + if (whosends(ci) == findbot(Config.s_ChanServ)) { + ircdproto->SendJoin(findbot(Config.s_ChanServ), c->name, c->creation_time); + ircdproto->SendMode(NULL, c->name, "+o %s", Config.s_ChanServ); } } @@ -1411,8 +1411,8 @@ int check_topiclock(Channel * c, time_t topic_time) c->topic ? c->topic : "", c->topic_time); if (ircd->join2set) { - if (whosends(ci) == findbot(s_ChanServ)) { - ircdproto->SendPart(findbot(s_ChanServ), c->ci->name, NULL); + if (whosends(ci) == findbot(Config.s_ChanServ)) { + ircdproto->SendPart(findbot(Config.s_ChanServ), c->ci->name, NULL); } } return 1; @@ -1428,13 +1428,13 @@ void expire_chans() int i; time_t now = time(NULL); - if (!CSExpire) + if (!Config.CSExpire) return; for (i = 0; i < 256; i++) { for (ci = chanlists[i]; ci; ci = next) { next = ci->next; - if (!ci->c && now - ci->last_used >= CSExpire && !ci->HasFlag(CI_FORBIDDEN) && !ci->HasFlag(CI_NO_EXPIRE) && !ci->HasFlag(CI_SUSPENDED)) + if (!ci->c && now - ci->last_used >= Config.CSExpire && !ci->HasFlag(CI_FORBIDDEN) && !ci->HasFlag(CI_NO_EXPIRE) && !ci->HasFlag(CI_SUSPENDED)) { EventReturn MOD_RESULT; FOREACH_RESULT(I_OnPreChanExpire, OnPreChanExpire(ci)); @@ -1469,18 +1469,18 @@ void cs_remove_nick(const NickCore * nc) if (ci->founder == nc) { if (ci->successor) { NickCore *nc2 = ci->successor; - if (!nc2->IsServicesOper() && CSMaxReg && nc2->channelcount >= CSMaxReg) { - alog("%s: Successor (%s) of %s owns too many channels, " "deleting channel", s_ChanServ, nc2->display, ci->name); + if (!nc2->IsServicesOper() && Config.CSMaxReg && nc2->channelcount >= Config.CSMaxReg) { + alog("%s: Successor (%s) of %s owns too many channels, " "deleting channel", Config.s_ChanServ, nc2->display, ci->name); delete ci; continue; } else { - alog("%s: Transferring foundership of %s from deleted " "nick %s to successor %s", s_ChanServ, ci->name, nc->display, nc2->display); + alog("%s: Transferring foundership of %s from deleted " "nick %s to successor %s", Config.s_ChanServ, ci->name, nc->display, nc2->display); ci->founder = nc2; ci->successor = NULL; nc2->channelcount++; } } else { - alog("%s: Deleting channel %s owned by deleted nick %s", s_ChanServ, ci->name, nc->display); + alog("%s: Deleting channel %s owned by deleted nick %s", Config.s_ChanServ, ci->name, nc->display); if ((ModeManager::FindChannelModeByName(CMODE_REGISTERED))) { @@ -1898,7 +1898,7 @@ void stick_mask(ChannelInfo * ci, AutoKick * akick) av[0] = "+b"; av[1] = akick->mask.c_str(); ircdproto->SendMode(whosends(ci), ci->c->name, "+b %s", akick->mask.c_str()); - chan_set_modes(s_ChanServ, ci->c, 2, av, 1); + chan_set_modes(Config.s_ChanServ, ci->c, 2, av, 1); } /* Ban the stuck mask in a safe manner. */ @@ -1920,6 +1920,6 @@ void stick_all(ChannelInfo * ci) av[0] = "+b"; av[1] = akick->mask.c_str(); ircdproto->SendMode(whosends(ci), ci->c->name, "+b %s", akick->mask.c_str()); - chan_set_modes(s_ChanServ, ci->c, 2, av, 1); + chan_set_modes(Config.s_ChanServ, ci->c, 2, av, 1); } } diff --git a/src/commands.c b/src/commands.c index 22e9fb8de..ad6a154d6 100644 --- a/src/commands.c +++ b/src/commands.c @@ -70,7 +70,7 @@ void mod_run_cmd(char *service, User * u, CommandHash * cmdTable[], const char * // Command requires registered users only if (!nick_identified(u)) { - notice_lang(service, u, NICK_IDENTIFY_REQUIRED, s_NickServ); + notice_lang(service, u, NICK_IDENTIFY_REQUIRED, Config.s_NickServ); alog("Access denied for unregistered user %s with service %s and command %s", u->nick, service, cmd); return; } diff --git a/src/config.c b/src/config.c index e531dafa1..e7e821f0a 100644 --- a/src/config.c +++ b/src/config.c @@ -18,242 +18,26 @@ /*************************************************************************/ -ServerConfig serverConfig; - -/* Configurable variables: */ - -char *IRCDModule; - -std::list<Uplink *> Uplinks; - -char *LocalHost; -unsigned LocalPort; - -char *ServerName; -char *ServerDesc; -char *ServiceUser; -char *ServiceHost; - -char *HelpChannel; -char *LogChannel; -char *NetworkName; -unsigned NickLen; - -char *s_NickServ; -char *s_ChanServ; -char *s_MemoServ; -char *s_BotServ; -char *s_OperServ; -char *s_GlobalNoticer; -char *desc_NickServ; -char *desc_ChanServ; -char *desc_MemoServ; -char *desc_BotServ; -char *desc_OperServ; -char *desc_GlobalNoticer; - -char *HostDBName; /* Name of HostServ DB File */ -char *s_HostServ; /* HostServ Name */ -char *desc_HostServ; /* HostServ Description */ - -char *PIDFilename; -char *MOTDFilename; -char *NickDBName; -char *PreNickDBName; -char *ChanDBName; -char *BotDBName; -char *OperDBName; -char *NewsDBName; - -bool NoBackupOkay; -bool StrictPasswords; -unsigned BadPassLimit; -time_t BadPassTimeout; -time_t UpdateTimeout; -time_t ExpireTimeout; -time_t ReadTimeout; -time_t WarningTimeout; -time_t TimeoutCheck; -int KeepLogs; -int KeepBackups; -bool ForceForbidReason; -bool UsePrivmsg; -bool UseStrictPrivMsg; -bool DumpCore; -bool LogUsers; -unsigned NickRegDelay; -unsigned NewsCount; - -bool UseMail; -char *SendMailPath; -char *SendFrom; -bool RestrictMail; -time_t MailDelay; -bool DontQuoteAddresses; - -static std::string NSDefaults; -char *NSGuestNickPrefix; -bool NSAllowKillImmed; -bool NSNoGroupChange; -Flags<NickCoreFlag> NSDefFlags; -unsigned NSDefLanguage; -time_t NSRegDelay; -time_t NSResendDelay; -time_t NSExpire; -time_t NSRExpire; -bool NSForceEmail; -int NSMaxAliases; -unsigned NSAccessMax; -char *NSEnforcerUser; -char *NSEnforcerHost; -static char *temp_nsuserhost; -time_t NSReleaseTimeout; -bool NSListOpersOnly; -unsigned NSListMax; -bool NSSecureAdmins; -bool NSStrictPrivileges; -bool NSEmailReg; -bool NSModeOnID; -bool NSAddAccessOnReg; - -static std::string CSDefaults; -Flags<ChannelInfoFlag> CSDefFlags; -unsigned CSMaxReg; -time_t CSExpire; -int CSDefBantype; -unsigned CSAccessMax; -unsigned CSAutokickMax; -char *CSAutokickReason; -time_t CSInhabit; -bool CSListOpersOnly; -unsigned CSListMax; -bool CSOpersOnly; - -unsigned MSMaxMemos; -time_t MSSendDelay; -bool MSNotifyAll; -unsigned MSMemoReceipt; - -static std::string BSDefaults; -Flags<BotServFlag> BSDefFlags; -time_t BSKeepData; -unsigned BSMinUsers; -unsigned BSBadWordsMax; -bool BSSmartJoin; -bool BSGentleBWReason; -bool BSCaseSensitive; -char *BSFantasyCharacter; - -bool HideStatsO; -bool GlobalOnCycle; -bool AnonymousGlobal; -bool RestrictOperNicks; -char *GlobalOnCycleMessage; -char *GlobalOnCycleUP; -bool SuperAdmin; -bool LogBot; -bool LogMaxUsers; -bool DisableRaw; -time_t AutokillExpiry; -time_t ChankillExpiry; -time_t SGLineExpiry; -time_t SQLineExpiry; -time_t SZLineExpiry; -bool AkillOnAdd; -bool KillonSGline; -bool KillonSQline; -static std::string OSNotifications; -bool WallOper; -bool WallBadOS; -bool WallOSGlobal; -bool WallOSMode; -bool WallOSClearmodes; -bool WallOSKick; -bool WallOSAkill; -bool WallOSSGLine; -bool WallOSSQLine; -bool WallOSSZLine; -bool WallOSNoOp; -bool WallOSJupe; -bool WallAkillExpire; -bool WallSGLineExpire; -bool WallSQLineExpire; -bool WallSZLineExpire; -bool WallExceptionExpire; -bool WallDrop; -bool WallForbid; -bool WallGetpass; -bool WallSetpass; -bool AddAkiller; - -bool LimitSessions; -unsigned DefSessionLimit; -time_t ExceptionExpiry; -int MaxSessionKill; -unsigned MaxSessionLimit; -time_t SessionAutoKillExpiry; -char *ExceptionDBName; -char *SessionLimitExceeded; -char *SessionLimitDetailsLoc; - -bool OSOpersOnly; +ServerConfig Config; static std::string Modules; -std::list<std::string> ModulesAutoLoad; - -/** - * Core Module Stuff - **/ static std::string EncModules; -std::list<std::string> EncModuleList; - static std::string HostCoreModules; -std::list<std::string> HostServCoreModules; - static std::string MemoCoreModules; -std::list<std::string> MemoServCoreModules; - static std::string BotCoreModules; -std::list<std::string> BotServCoreModules; - static std::string OperCoreModules; -std::list<std::string> OperServCoreModules; - static std::string NickCoreModules; -std::list<std::string> NickServCoreModules; - static std::string ChanCoreModules; -std::list<std::string> ChanServCoreModules; - -int DefConLevel; static std::string DefCon1; static std::string DefCon2; static std::string DefCon3; static std::string DefCon4; -time_t DefConTimeOut; -int DefConSessionLimit; -time_t DefConAKILL; -char *DefConChanModes; -bool GlobalOnDefcon; -bool GlobalOnDefconMore; -char *DefConOffMessage; -char *DefconMessage; -char *DefConAkillReason; - -long unsigned int UserKey1; -long unsigned int UserKey2; -long unsigned int UserKey3; - -char *Numeric; static char *UlineServers; -char **Ulines; -int NumUlines; - -std::list<OperType *> MyOperTypes; -/* Pair of nick/opertype lookup. It's stored like this currently, because config is parsed before db load. - * XXX: It would be nice to not need this. - */ -std::list<std::pair<std::string, std::string> > svsopers_in_config; +static std::string OSNotifications; +static std::string BSDefaults; +static std::string CSDefaults; +static char *temp_nsuserhost; +static std::string NSDefaults; /*************************************************************************/ @@ -394,7 +178,7 @@ bool ValidateNotZero(ServerConfig *, const char *tag, const char *value, ValueIt bool ValidateEmailReg(ServerConfig *, const char *tag, const char *value, ValueItem &data) { - if (NSEmailReg) + if (Config.NSEmailReg) { if (std::string(value) == "prenickdatabase") { @@ -454,7 +238,7 @@ bool ValidateBantype(ServerConfig *, const char *, const char *, ValueItem &data bool ValidateBotServ(ServerConfig *, const char *tag, const char *value, ValueItem &data) { - if (s_BotServ) + if (Config.s_BotServ) { if (std::string(value) == "description" || std::string(value) == "database") { @@ -472,7 +256,7 @@ bool ValidateBotServ(ServerConfig *, const char *tag, const char *value, ValueIt bool ValidateHostServ(ServerConfig *, const char *tag, const char *value, ValueItem &data) { - if (s_HostServ) + if (Config.s_HostServ) { if (std::string(value) == "description" || std::string(value) == "database") { @@ -485,7 +269,7 @@ bool ValidateHostServ(ServerConfig *, const char *tag, const char *value, ValueI bool ValidateLimitSessions(ServerConfig *, const char *tag, const char *value, ValueItem &data) { - if (LimitSessions) + if (Config.LimitSessions) { if (std::string(value) == "maxsessionlimit" || std::string(value) == "exceptionexpiry") { @@ -506,14 +290,14 @@ bool ValidateDefCon(ServerConfig *, const char *tag, const char *value, ValueIte if (level > 5) throw ConfigException("The value for <defcon:defaultlevel> must be between 1 through 5 if you wish to use DefCon or 0 if you wish to disable it!"); } - else if (DefConLevel) + else if (Config.DefConLevel) { if ((std::string(value).substr(0, 5) == "level" && isdigit(value[5])) || std::string(value) == "chanmodes" || std::string(value) == "akillreason") { if (data.GetValue().empty()) throw ConfigException(std::string("The value for <") + tag + ":" + value + "> cannot be empty when DefCon is enabled!"); } - else if (std::string(value) == "message" && GlobalOnDefconMore) + else if (std::string(value) == "message" && Config.GlobalOnDefconMore) { if (data.GetValue().empty()) throw ConfigException("The value for <defcon:message> cannot be empty when globalondefconmore is enabled!"); @@ -546,7 +330,7 @@ bool ValidateNickLen(ServerConfig *, const char *, const char *, ValueItem &data bool ValidateMail(ServerConfig *, const char *tag, const char *value, ValueItem &data) { - if (UseMail) + if (Config.UseMail) { if (std::string(value) == "sendmailpath" || std::string(value) == "sendfrom") { @@ -559,12 +343,12 @@ bool ValidateMail(ServerConfig *, const char *tag, const char *value, ValueItem bool ValidateGlobalOnCycle(ServerConfig *, const char *tag, const char *value, ValueItem &data) { - if (GlobalOnCycle) + if (Config.GlobalOnCycle) { if (data.GetValue().empty()) { alog("<%s:%s> was undefined, disabling <options:globaloncycle>", tag, value); - GlobalOnCycle = false; + Config.GlobalOnCycle = false; } } return true; @@ -585,13 +369,13 @@ bool InitUplinks(ServerConfig *, const char *, bool bail) // If bail is false, we were reloading, don't clear anything if (!bail) return true; - if (!Uplinks.empty()) + if (!Config.Uplinks.empty()) { - std::list<Uplink *>::iterator curr_uplink = Uplinks.begin(), end_uplink = Uplinks.end(); + std::list<Uplink *>::iterator curr_uplink = Config.Uplinks.begin(), end_uplink = Config.Uplinks.end(); for (; curr_uplink != end_uplink; ++curr_uplink) delete *curr_uplink; } - Uplinks.clear(); + Config.Uplinks.clear(); return true; } @@ -614,7 +398,7 @@ bool DoUplink(ServerConfig *conf, const char *, const char **, ValueList &values if (!ValidateNotEmpty(conf, "uplink", "password", vi_password)) throw ConfigException("One or more values in your configuration file failed to validate. Please see your log for more information."); // If we get here, all the values are valid, we'll add it to the Uplinks list - Uplinks.push_back(new Uplink(host, port, password)); + Config.Uplinks.push_back(new Uplink(host, port, password)); return true; } @@ -623,17 +407,17 @@ bool DoneUplinks(ServerConfig *, const char *, bool bail) // If bail is false, we were reloading, ignore this check if (!bail) return true; - if (Uplinks.empty()) + if (Config.Uplinks.empty()) throw ConfigException("You must define at least one uplink block!"); return true; } static bool InitOperTypes(ServerConfig *, const char *, bool) { - for (std::list<OperType *>::iterator it = MyOperTypes.begin(); it != MyOperTypes.end(); ++it) + for (std::list<OperType *>::iterator it = Config.MyOperTypes.begin(); it != Config.MyOperTypes.end(); ++it) delete *it; - MyOperTypes.clear(); + Config.MyOperTypes.clear(); return true; } @@ -658,7 +442,7 @@ static bool DoOperType(ServerConfig *conf, const char *, const char **, ValueLis while (privstr.GetToken(tok)) ot->AddPriv(tok); - MyOperTypes.push_back(ot); + Config.MyOperTypes.push_back(ot); return true; } @@ -694,14 +478,14 @@ static bool DoOper(ServerConfig *conf, const char *, const char **, ValueList &v if (!ValidateNotEmpty(conf, "oper", "type", vi2)) throw ConfigException("One or more values in your configuration file failed to validate. Please see your log for more information."); - svsopers_in_config.push_back(std::make_pair(name, type)); + Config.Opers.push_back(std::make_pair(name, type)); return true; } static bool DoneOpers(ServerConfig *, const char *, bool) { // XXX: this is duplicated in config.c - for (std::list<std::pair<std::string, std::string> >::iterator it = svsopers_in_config.begin(); it != svsopers_in_config.end(); ++it) + for (std::list<std::pair<std::string, std::string> >::iterator it = Config.Opers.begin(); it != Config.Opers.end(); ++it) { std::string nick = it->first, type = it->second; @@ -714,7 +498,7 @@ static bool DoneOpers(ServerConfig *, const char *, bool) // Nick with no core (wtf?) abort(); - for (std::list<OperType *>::iterator tit = MyOperTypes.begin(); tit != MyOperTypes.end(); ++tit) + for (std::list<OperType *>::iterator tit = Config.MyOperTypes.begin(); tit != Config.MyOperTypes.end(); ++tit) { OperType *ot = *tit; if (ot->GetName() == type) @@ -811,164 +595,164 @@ int ServerConfig::Read(bool bail) * * We may need to add some other validation functions to handle certain things, we can handle that later. * Any questions about these, w00t, feel free to ask. */ - {"serverinfo", "name", "", new ValueContainerChar(&ServerName), DT_HOSTNAME | DT_NORELOAD, ValidateNotEmpty}, - {"serverinfo", "description", "", new ValueContainerChar(&ServerDesc), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"serverinfo", "localhost", "", new ValueContainerChar(&LocalHost), DT_HOSTNAME | DT_NORELOAD, NoValidation}, - {"serverinfo", "localport", "0", new ValueContainerUInt(&LocalPort), DT_UINTEGER | DT_NORELOAD, ValidatePort}, - {"serverinfo", "type", "", new ValueContainerChar(&IRCDModule), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"serverinfo", "id", "", new ValueContainerChar(&Numeric), DT_NOSPACES | DT_NORELOAD, NoValidation}, - {"serverinfo", "ident", "", new ValueContainerChar(&ServiceUser), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"serverinfo", "hostname", "", new ValueContainerChar(&ServiceHost), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"serverinfo", "pid", "services.pid", new ValueContainerChar(&PIDFilename), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"serverinfo", "motd", "services.motd", new ValueContainerChar(&MOTDFilename), DT_CHARPTR, ValidateNotEmpty}, - {"networkinfo", "helpchannel", "", new ValueContainerChar(&HelpChannel), DT_CHARPTR, NoValidation}, - {"networkinfo", "logchannel", "", new ValueContainerChar(&LogChannel), DT_CHARPTR, NoValidation}, - {"networkinfo", "logbot", "no", new ValueContainerBool(&LogBot), DT_BOOLEAN, NoValidation}, - {"networkinfo", "networkname", "", new ValueContainerChar(&NetworkName), DT_CHARPTR, ValidateNotEmpty}, - {"networkinfo", "nicklen", "0", new ValueContainerUInt(&NickLen), DT_UINTEGER | DT_NORELOAD, ValidateNickLen}, + {"serverinfo", "name", "", new ValueContainerChar(&Config.ServerName), DT_HOSTNAME | DT_NORELOAD, ValidateNotEmpty}, + {"serverinfo", "description", "", new ValueContainerChar(&Config.ServerDesc), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"serverinfo", "localhost", "", new ValueContainerChar(&Config.LocalHost), DT_HOSTNAME | DT_NORELOAD, NoValidation}, + {"serverinfo", "localport", "0", new ValueContainerUInt(&Config.LocalPort), DT_UINTEGER | DT_NORELOAD, ValidatePort}, + {"serverinfo", "type", "", new ValueContainerChar(&Config.IRCDModule), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"serverinfo", "id", "", new ValueContainerChar(&Config.Numeric), DT_NOSPACES | DT_NORELOAD, NoValidation}, + {"serverinfo", "ident", "", new ValueContainerChar(&Config.ServiceUser), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"serverinfo", "hostname", "", new ValueContainerChar(&Config.ServiceHost), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"serverinfo", "pid", "services.pid", new ValueContainerChar(&Config.PIDFilename), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"serverinfo", "motd", "services.motd", new ValueContainerChar(&Config.MOTDFilename), DT_CHARPTR, ValidateNotEmpty}, + {"networkinfo", "helpchannel", "", new ValueContainerChar(&Config.HelpChannel), DT_CHARPTR, NoValidation}, + {"networkinfo", "logchannel", "", new ValueContainerChar(&Config.LogChannel), DT_CHARPTR, NoValidation}, + {"networkinfo", "logbot", "no", new ValueContainerBool(&Config.LogBot), DT_BOOLEAN, NoValidation}, + {"networkinfo", "networkname", "", new ValueContainerChar(&Config.NetworkName), DT_CHARPTR, ValidateNotEmpty}, + {"networkinfo", "nicklen", "0", new ValueContainerUInt(&Config.NickLen), DT_UINTEGER | DT_NORELOAD, ValidateNickLen}, {"options", "encryption", "", new ValueContainerString(&EncModules), DT_STRING | DT_NORELOAD, ValidateNotEmpty}, - {"options", "userkey1", "0", new ValueContainerLUInt(&UserKey1), DT_LUINTEGER, NoValidation}, - {"options", "userkey2", "0", new ValueContainerLUInt(&UserKey2), DT_LUINTEGER, NoValidation}, - {"options", "userkey3", "0", new ValueContainerLUInt(&UserKey3), DT_LUINTEGER, NoValidation}, - {"options", "nobackupokay", "no", new ValueContainerBool(&NoBackupOkay), DT_BOOLEAN, NoValidation}, - {"options", "strictpasswords", "no", new ValueContainerBool(&StrictPasswords), DT_BOOLEAN, NoValidation}, - {"options", "badpasslimit", "0", new ValueContainerUInt(&BadPassLimit), DT_UINTEGER, NoValidation}, - {"options", "badpasstimeout", "0", new ValueContainerTime(&BadPassTimeout), DT_TIME, NoValidation}, - {"options", "updatetimeout", "0", new ValueContainerTime(&UpdateTimeout), DT_TIME, ValidateNotZero}, - {"options", "expiretimeout", "0", new ValueContainerTime(&ExpireTimeout), DT_TIME, ValidateNotZero}, - {"options", "readtimeout", "0", new ValueContainerTime(&ReadTimeout), DT_TIME, ValidateNotZero}, - {"options", "warningtimeout", "0", new ValueContainerTime(&WarningTimeout), DT_TIME, ValidateNotZero}, - {"options", "timeoutcheck", "0", new ValueContainerTime(&TimeoutCheck), DT_TIME, NoValidation}, - {"options", "keeplogs", "0", new ValueContainerInt(&KeepLogs), DT_INTEGER, NoValidation}, - {"options", "keepbackups", "0", new ValueContainerInt(&KeepBackups), DT_INTEGER, NoValidation}, - {"options", "forceforbidreason", "no", new ValueContainerBool(&ForceForbidReason), DT_BOOLEAN, NoValidation}, - {"options", "useprivmsg", "no", new ValueContainerBool(&UsePrivmsg), DT_BOOLEAN, NoValidation}, - {"options", "usestrictprivmsg", "no", new ValueContainerBool(&UseStrictPrivMsg), DT_BOOLEAN, NoValidation}, - {"options", "dumpcore", "yes", new ValueContainerBool(&DumpCore), DT_BOOLEAN | DT_NORELOAD, NoValidation}, - {"options", "logusers", "no", new ValueContainerBool(&LogUsers), DT_BOOLEAN, NoValidation}, - {"options", "hidestatso", "no", new ValueContainerBool(&HideStatsO), DT_BOOLEAN, NoValidation}, - {"options", "globaloncycle", "no", new ValueContainerBool(&GlobalOnCycle), DT_BOOLEAN, NoValidation}, - {"options", "globaloncycledown", "", new ValueContainerChar(&GlobalOnCycleMessage), DT_CHARPTR, ValidateGlobalOnCycle}, - {"options", "globaloncycleup", "", new ValueContainerChar(&GlobalOnCycleUP), DT_CHARPTR, ValidateGlobalOnCycle}, - {"options", "anonymousglobal", "no", new ValueContainerBool(&AnonymousGlobal), DT_BOOLEAN, NoValidation}, - {"options", "nickregdelay", "0", new ValueContainerUInt(&NickRegDelay), DT_UINTEGER, NoValidation}, - {"options", "restrictopernicks", "no", new ValueContainerBool(&RestrictOperNicks), DT_BOOLEAN, NoValidation}, - {"options", "newscount", "3", new ValueContainerUInt(&NewsCount), DT_UINTEGER, NoValidation}, + {"options", "userkey1", "0", new ValueContainerLUInt(&Config.UserKey1), DT_LUINTEGER, NoValidation}, + {"options", "userkey2", "0", new ValueContainerLUInt(&Config.UserKey2), DT_LUINTEGER, NoValidation}, + {"options", "userkey3", "0", new ValueContainerLUInt(&Config.UserKey3), DT_LUINTEGER, NoValidation}, + {"options", "nobackupokay", "no", new ValueContainerBool(&Config.NoBackupOkay), DT_BOOLEAN, NoValidation}, + {"options", "strictpasswords", "no", new ValueContainerBool(&Config.StrictPasswords), DT_BOOLEAN, NoValidation}, + {"options", "badpasslimit", "0", new ValueContainerUInt(&Config.BadPassLimit), DT_UINTEGER, NoValidation}, + {"options", "badpasstimeout", "0", new ValueContainerTime(&Config.BadPassTimeout), DT_TIME, NoValidation}, + {"options", "updatetimeout", "0", new ValueContainerTime(&Config.UpdateTimeout), DT_TIME, ValidateNotZero}, + {"options", "expiretimeout", "0", new ValueContainerTime(&Config.ExpireTimeout), DT_TIME, ValidateNotZero}, + {"options", "readtimeout", "0", new ValueContainerTime(&Config.ReadTimeout), DT_TIME, ValidateNotZero}, + {"options", "warningtimeout", "0", new ValueContainerTime(&Config.WarningTimeout), DT_TIME, ValidateNotZero}, + {"options", "timeoutcheck", "0", new ValueContainerTime(&Config.TimeoutCheck), DT_TIME, NoValidation}, + {"options", "keeplogs", "0", new ValueContainerInt(&Config.KeepLogs), DT_INTEGER, NoValidation}, + {"options", "keepbackups", "0", new ValueContainerInt(&Config.KeepBackups), DT_INTEGER, NoValidation}, + {"options", "forceforbidreason", "no", new ValueContainerBool(&Config.ForceForbidReason), DT_BOOLEAN, NoValidation}, + {"options", "useprivmsg", "no", new ValueContainerBool(&Config.UsePrivmsg), DT_BOOLEAN, NoValidation}, + {"options", "usestrictprivmsg", "no", new ValueContainerBool(&Config.UseStrictPrivMsg), DT_BOOLEAN, NoValidation}, + {"options", "dumpcore", "yes", new ValueContainerBool(&Config.DumpCore), DT_BOOLEAN | DT_NORELOAD, NoValidation}, + {"options", "logusers", "no", new ValueContainerBool(&Config.LogUsers), DT_BOOLEAN, NoValidation}, + {"options", "hidestatso", "no", new ValueContainerBool(&Config.HideStatsO), DT_BOOLEAN, NoValidation}, + {"options", "globaloncycle", "no", new ValueContainerBool(&Config.GlobalOnCycle), DT_BOOLEAN, NoValidation}, + {"options", "globaloncycledown", "", new ValueContainerChar(&Config.GlobalOnCycleMessage), DT_CHARPTR, ValidateGlobalOnCycle}, + {"options", "globaloncycleup", "", new ValueContainerChar(&Config.GlobalOnCycleUP), DT_CHARPTR, ValidateGlobalOnCycle}, + {"options", "anonymousglobal", "no", new ValueContainerBool(&Config.AnonymousGlobal), DT_BOOLEAN, NoValidation}, + {"options", "nickregdelay", "0", new ValueContainerUInt(&Config.NickRegDelay), DT_UINTEGER, NoValidation}, + {"options", "restrictopernicks", "no", new ValueContainerBool(&Config.RestrictOperNicks), DT_BOOLEAN, NoValidation}, + {"options", "newscount", "3", new ValueContainerUInt(&Config.NewsCount), DT_UINTEGER, NoValidation}, {"options", "ulineservers", "", new ValueContainerChar(&UlineServers), DT_CHARPTR, NoValidation}, {"options", "enablelogchannel", "no", new ValueContainerBool(&LogChan), DT_BOOLEAN, NoValidation}, - {"nickserv", "nick", "NickServ", new ValueContainerChar(&s_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"nickserv", "description", "Nickname Registration Service", new ValueContainerChar(&desc_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"nickserv", "database", "nick.db", new ValueContainerChar(&NickDBName), DT_CHARPTR, ValidateNotEmpty}, - {"nickserv", "emailregistration", "no", new ValueContainerBool(&NSEmailReg), DT_BOOLEAN, NoValidation}, - {"nickserv", "prenickdatabase", "", new ValueContainerChar(&PreNickDBName), DT_CHARPTR, ValidateEmailReg}, + {"nickserv", "nick", "NickServ", new ValueContainerChar(&Config.s_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"nickserv", "description", "Nickname Registration Service", new ValueContainerChar(&Config.desc_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"nickserv", "database", "nick.db", new ValueContainerChar(&Config.NickDBName), DT_CHARPTR, ValidateNotEmpty}, + {"nickserv", "emailregistration", "no", new ValueContainerBool(&Config.NSEmailReg), DT_BOOLEAN, NoValidation}, + {"nickserv", "prenickdatabase", "", new ValueContainerChar(&Config.PreNickDBName), DT_CHARPTR, ValidateEmailReg}, {"nickserv", "modules", "", new ValueContainerString(&NickCoreModules), DT_STRING, NoValidation}, - {"nickserv", "forceemail", "no", new ValueContainerBool(&NSForceEmail), DT_BOOLEAN, ValidateEmailReg}, + {"nickserv", "forceemail", "no", new ValueContainerBool(&Config.NSForceEmail), DT_BOOLEAN, ValidateEmailReg}, {"nickserv", "defaults", "secure memosignon memoreceive", new ValueContainerString(&NSDefaults), DT_STRING, NoValidation}, - {"nickserv", "defaultlanguage", "0", new ValueContainerUInt(&NSDefLanguage), DT_UINTEGER, ValidateLanguage}, - {"nickserv", "regdelay", "0", new ValueContainerTime(&NSRegDelay), DT_TIME, NoValidation}, - {"nickserv", "resenddelay", "0", new ValueContainerTime(&NSResendDelay), DT_TIME, NoValidation}, - {"nickserv", "expire", "21d", new ValueContainerTime(&NSExpire), DT_TIME, NoValidation}, - {"nickserv", "preregexpire", "0", new ValueContainerTime(&NSRExpire), DT_TIME, ValidateEmailReg}, - {"nickserv", "maxaliases", "0", new ValueContainerInt(&NSMaxAliases), DT_INTEGER, NoValidation}, - {"nickserv", "accessmax", "0", new ValueContainerUInt(&NSAccessMax), DT_UINTEGER, ValidateNotZero}, + {"nickserv", "defaultlanguage", "0", new ValueContainerUInt(&Config.NSDefLanguage), DT_UINTEGER, ValidateLanguage}, + {"nickserv", "regdelay", "0", new ValueContainerTime(&Config.NSRegDelay), DT_TIME, NoValidation}, + {"nickserv", "resenddelay", "0", new ValueContainerTime(&Config.NSResendDelay), DT_TIME, NoValidation}, + {"nickserv", "expire", "21d", new ValueContainerTime(&Config.NSExpire), DT_TIME, NoValidation}, + {"nickserv", "preregexpire", "0", new ValueContainerTime(&Config.NSRExpire), DT_TIME, ValidateEmailReg}, + {"nickserv", "maxaliases", "0", new ValueContainerInt(&Config.NSMaxAliases), DT_INTEGER, NoValidation}, + {"nickserv", "accessmax", "0", new ValueContainerUInt(&Config.NSAccessMax), DT_UINTEGER, ValidateNotZero}, {"nickserv", "enforceruser", "", new ValueContainerChar(&temp_nsuserhost), DT_CHARPTR, ValidateNotEmpty}, - {"nickserv", "releasetimeout", "0", new ValueContainerTime(&NSReleaseTimeout), DT_TIME, ValidateNotZero}, - {"nickserv", "allowkillimmed", "no", new ValueContainerBool(&NSAllowKillImmed), DT_BOOLEAN | DT_NORELOAD, NoValidation}, - {"nickserv", "nogroupchange", "no", new ValueContainerBool(&NSNoGroupChange), DT_BOOLEAN, NoValidation}, - {"nickserv", "listopersonly", "no", new ValueContainerBool(&NSListOpersOnly), DT_BOOLEAN, NoValidation}, - {"nickserv", "listmax", "0", new ValueContainerUInt(&NSListMax), DT_UINTEGER, ValidateNotZero}, - {"nickserv", "guestnickprefix", "", new ValueContainerChar(&NSGuestNickPrefix), DT_CHARPTR, ValidateGuestPrefix}, - {"nickserv", "secureadmins", "no", new ValueContainerBool(&NSSecureAdmins), DT_BOOLEAN, NoValidation}, - {"nickserv", "strictprivileges", "no", new ValueContainerBool(&NSStrictPrivileges), DT_BOOLEAN, NoValidation}, - {"nickserv", "modeonid", "no", new ValueContainerBool(&NSModeOnID), DT_BOOLEAN, NoValidation}, - {"nickserv", "addaccessonreg", "no", new ValueContainerBool(&NSAddAccessOnReg), DT_BOOLEAN, NoValidation}, - {"mail", "usemail", "no", new ValueContainerBool(&UseMail), DT_BOOLEAN, ValidateEmailReg}, - {"mail", "sendmailpath", "", new ValueContainerChar(&SendMailPath), DT_CHARPTR, ValidateMail}, - {"mail", "sendfrom", "", new ValueContainerChar(&SendFrom), DT_CHARPTR, ValidateMail}, - {"mail", "restrict", "no", new ValueContainerBool(&RestrictMail), DT_BOOLEAN, NoValidation}, - {"mail", "delay", "0", new ValueContainerTime(&MailDelay), DT_TIME, NoValidation}, - {"mail", "dontquoteaddresses", "no", new ValueContainerBool(&DontQuoteAddresses), DT_BOOLEAN, NoValidation}, - {"chanserv", "nick", "ChanServ", new ValueContainerChar(&s_ChanServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"chanserv", "description", "Channel Registration Service", new ValueContainerChar(&desc_ChanServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"chanserv", "database", "chan.db", new ValueContainerChar(&ChanDBName), DT_CHARPTR, ValidateNotEmpty}, + {"nickserv", "releasetimeout", "0", new ValueContainerTime(&Config.NSReleaseTimeout), DT_TIME, ValidateNotZero}, + {"nickserv", "allowkillimmed", "no", new ValueContainerBool(&Config.NSAllowKillImmed), DT_BOOLEAN | DT_NORELOAD, NoValidation}, + {"nickserv", "nogroupchange", "no", new ValueContainerBool(&Config.NSNoGroupChange), DT_BOOLEAN, NoValidation}, + {"nickserv", "listopersonly", "no", new ValueContainerBool(&Config.NSListOpersOnly), DT_BOOLEAN, NoValidation}, + {"nickserv", "listmax", "0", new ValueContainerUInt(&Config.NSListMax), DT_UINTEGER, ValidateNotZero}, + {"nickserv", "guestnickprefix", "", new ValueContainerChar(&Config.NSGuestNickPrefix), DT_CHARPTR, ValidateGuestPrefix}, + {"nickserv", "secureadmins", "no", new ValueContainerBool(&Config.NSSecureAdmins), DT_BOOLEAN, NoValidation}, + {"nickserv", "strictprivileges", "no", new ValueContainerBool(&Config.NSStrictPrivileges), DT_BOOLEAN, NoValidation}, + {"nickserv", "modeonid", "no", new ValueContainerBool(&Config.NSModeOnID), DT_BOOLEAN, NoValidation}, + {"nickserv", "addaccessonreg", "no", new ValueContainerBool(&Config.NSAddAccessOnReg), DT_BOOLEAN, NoValidation}, + {"mail", "usemail", "no", new ValueContainerBool(&Config.UseMail), DT_BOOLEAN, ValidateEmailReg}, + {"mail", "sendmailpath", "", new ValueContainerChar(&Config.SendMailPath), DT_CHARPTR, ValidateMail}, + {"mail", "sendfrom", "", new ValueContainerChar(&Config.SendFrom), DT_CHARPTR, ValidateMail}, + {"mail", "restrict", "no", new ValueContainerBool(&Config.RestrictMail), DT_BOOLEAN, NoValidation}, + {"mail", "delay", "0", new ValueContainerTime(&Config.MailDelay), DT_TIME, NoValidation}, + {"mail", "dontquoteaddresses", "no", new ValueContainerBool(&Config.DontQuoteAddresses), DT_BOOLEAN, NoValidation}, + {"chanserv", "nick", "ChanServ", new ValueContainerChar(&Config.s_ChanServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"chanserv", "description", "Channel Registration Service", new ValueContainerChar(&Config.desc_ChanServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"chanserv", "database", "chan.db", new ValueContainerChar(&Config.ChanDBName), DT_CHARPTR, ValidateNotEmpty}, {"chanserv", "modules", "", new ValueContainerString(&ChanCoreModules), DT_STRING, NoValidation}, {"chanserv", "defaults", "keeptopic secure securefounder signkick", new ValueContainerString(&CSDefaults), DT_STRING, NoValidation}, - {"chanserv", "maxregistered", "0", new ValueContainerUInt(&CSMaxReg), DT_UINTEGER, NoValidation}, - {"chanserv", "expire", "14d", new ValueContainerTime(&CSExpire), DT_TIME, NoValidation}, - {"chanserv", "defbantype", "2", new ValueContainerInt(&CSDefBantype), DT_INTEGER, ValidateBantype}, - {"chanserv", "accessmax", "0", new ValueContainerUInt(&CSAccessMax), DT_UINTEGER, ValidateNotZero}, - {"chanserv", "autokickmax", "0", new ValueContainerUInt(&CSAutokickMax), DT_UINTEGER, ValidateNotZero}, - {"chanserv", "autokickreason", "User has been banned from the channel", new ValueContainerChar(&CSAutokickReason), DT_CHARPTR, ValidateNotEmpty}, - {"chanserv", "inhabit", "0", new ValueContainerTime(&CSInhabit), DT_TIME, ValidateNotZero}, - {"chanserv", "listopersonly", "no", new ValueContainerBool(&CSListOpersOnly), DT_BOOLEAN, NoValidation}, - {"chanserv", "listmax", "0", new ValueContainerUInt(&CSListMax), DT_UINTEGER, ValidateNotZero}, - {"chanserv", "opersonly", "no", new ValueContainerBool(&CSOpersOnly), DT_BOOLEAN, NoValidation}, - {"memoserv", "nick", "MemoServ", new ValueContainerChar(&s_MemoServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"memoserv", "description", "Memo Service", new ValueContainerChar(&desc_MemoServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"chanserv", "maxregistered", "0", new ValueContainerUInt(&Config.CSMaxReg), DT_UINTEGER, NoValidation}, + {"chanserv", "expire", "14d", new ValueContainerTime(&Config.CSExpire), DT_TIME, NoValidation}, + {"chanserv", "defbantype", "2", new ValueContainerInt(&Config.CSDefBantype), DT_INTEGER, ValidateBantype}, + {"chanserv", "accessmax", "0", new ValueContainerUInt(&Config.CSAccessMax), DT_UINTEGER, ValidateNotZero}, + {"chanserv", "autokickmax", "0", new ValueContainerUInt(&Config.CSAutokickMax), DT_UINTEGER, ValidateNotZero}, + {"chanserv", "autokickreason", "User has been banned from the channel", new ValueContainerChar(&Config.CSAutokickReason), DT_CHARPTR, ValidateNotEmpty}, + {"chanserv", "inhabit", "0", new ValueContainerTime(&Config.CSInhabit), DT_TIME, ValidateNotZero}, + {"chanserv", "listopersonly", "no", new ValueContainerBool(&Config.CSListOpersOnly), DT_BOOLEAN, NoValidation}, + {"chanserv", "listmax", "0", new ValueContainerUInt(&Config.CSListMax), DT_UINTEGER, ValidateNotZero}, + {"chanserv", "opersonly", "no", new ValueContainerBool(&Config.CSOpersOnly), DT_BOOLEAN, NoValidation}, + {"memoserv", "nick", "MemoServ", new ValueContainerChar(&Config.s_MemoServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"memoserv", "description", "Memo Service", new ValueContainerChar(&Config.desc_MemoServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"memoserv", "modules", "", new ValueContainerString(&MemoCoreModules), DT_STRING, NoValidation}, - {"memoserv", "maxmemos", "0", new ValueContainerUInt(&MSMaxMemos), DT_UINTEGER, NoValidation}, - {"memoserv", "senddelay", "0", new ValueContainerTime(&MSSendDelay), DT_TIME, NoValidation}, - {"memoserv", "notifyall", "no", new ValueContainerBool(&MSNotifyAll), DT_BOOLEAN, NoValidation}, - {"memoserv", "memoreceipt", "0", new ValueContainerUInt(&MSMemoReceipt), DT_UINTEGER, NoValidation}, - {"botserv", "nick", "", new ValueContainerChar(&s_BotServ), DT_CHARPTR | DT_NORELOAD, NoValidation}, - {"botserv", "description", "Bot Service", new ValueContainerChar(&desc_BotServ), DT_CHARPTR | DT_NORELOAD, ValidateBotServ}, - {"botserv", "database", "bot.db", new ValueContainerChar(&BotDBName), DT_CHARPTR, ValidateBotServ}, + {"memoserv", "maxmemos", "0", new ValueContainerUInt(&Config.MSMaxMemos), DT_UINTEGER, NoValidation}, + {"memoserv", "senddelay", "0", new ValueContainerTime(&Config.MSSendDelay), DT_TIME, NoValidation}, + {"memoserv", "notifyall", "no", new ValueContainerBool(&Config.MSNotifyAll), DT_BOOLEAN, NoValidation}, + {"memoserv", "memoreceipt", "0", new ValueContainerUInt(&Config.MSMemoReceipt), DT_UINTEGER, NoValidation}, + {"botserv", "nick", "", new ValueContainerChar(&Config.s_BotServ), DT_CHARPTR | DT_NORELOAD, NoValidation}, + {"botserv", "description", "Bot Service", new ValueContainerChar(&Config.desc_BotServ), DT_CHARPTR | DT_NORELOAD, ValidateBotServ}, + {"botserv", "database", "bot.db", new ValueContainerChar(&Config.BotDBName), DT_CHARPTR, ValidateBotServ}, {"botserv", "modules", "", new ValueContainerString(&BotCoreModules), DT_STRING, NoValidation}, {"botserv", "defaults", "", new ValueContainerString(&BSDefaults), DT_STRING, NoValidation}, - {"botserv", "minusers", "0", new ValueContainerUInt(&BSMinUsers), DT_UINTEGER, ValidateBotServ}, - {"botserv", "badwordsmax", "0", new ValueContainerUInt(&BSBadWordsMax), DT_UINTEGER, ValidateBotServ}, - {"botserv", "keepdata", "0", new ValueContainerTime(&BSKeepData), DT_TIME, ValidateBotServ}, - {"botserv", "smartjoin", "no", new ValueContainerBool(&BSSmartJoin), DT_BOOLEAN, NoValidation}, - {"botserv", "gentlebadwordreason", "no", new ValueContainerBool(&BSGentleBWReason), DT_BOOLEAN, NoValidation}, - {"botserv", "casesensitive", "no", new ValueContainerBool(&BSCaseSensitive), DT_BOOLEAN, NoValidation}, - {"botserv", "fantasycharacter", "!", new ValueContainerChar(&BSFantasyCharacter), DT_CHARPTR, NoValidation}, - {"hostserv", "nick", "", new ValueContainerChar(&s_HostServ), DT_CHARPTR | DT_NORELOAD, NoValidation}, - {"hostserv", "description", "vHost Service", new ValueContainerChar(&desc_HostServ), DT_CHARPTR | DT_NORELOAD, ValidateHostServ}, - {"hostserv", "database", "hosts.db", new ValueContainerChar(&HostDBName), DT_CHARPTR, ValidateHostServ}, + {"botserv", "minusers", "0", new ValueContainerUInt(&Config.BSMinUsers), DT_UINTEGER, ValidateBotServ}, + {"botserv", "badwordsmax", "0", new ValueContainerUInt(&Config.BSBadWordsMax), DT_UINTEGER, ValidateBotServ}, + {"botserv", "keepdata", "0", new ValueContainerTime(&Config.BSKeepData), DT_TIME, ValidateBotServ}, + {"botserv", "smartjoin", "no", new ValueContainerBool(&Config.BSSmartJoin), DT_BOOLEAN, NoValidation}, + {"botserv", "gentlebadwordreason", "no", new ValueContainerBool(&Config.BSGentleBWReason), DT_BOOLEAN, NoValidation}, + {"botserv", "casesensitive", "no", new ValueContainerBool(&Config.BSCaseSensitive), DT_BOOLEAN, NoValidation}, + {"botserv", "fantasycharacter", "!", new ValueContainerChar(&Config.BSFantasyCharacter), DT_CHARPTR, NoValidation}, + {"hostserv", "nick", "", new ValueContainerChar(&Config.s_HostServ), DT_CHARPTR | DT_NORELOAD, NoValidation}, + {"hostserv", "description", "vHost Service", new ValueContainerChar(&Config.desc_HostServ), DT_CHARPTR | DT_NORELOAD, ValidateHostServ}, + {"hostserv", "database", "hosts.db", new ValueContainerChar(&Config.HostDBName), DT_CHARPTR, ValidateHostServ}, {"hostserv", "modules", "", new ValueContainerString(&HostCoreModules), DT_STRING, NoValidation}, - {"operserv", "nick", "OperServ", new ValueContainerChar(&s_OperServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"operserv", "description", "Operator Service", new ValueContainerChar(&desc_OperServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"operserv", "globalnick", "Global", new ValueContainerChar(&s_GlobalNoticer), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"operserv", "globaldescription", "Global Noticer", new ValueContainerChar(&desc_GlobalNoticer), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, - {"operserv", "database", "oper.db", new ValueContainerChar(&OperDBName), DT_CHARPTR, ValidateNotEmpty}, - {"operserv", "newsdatabase", "news.db", new ValueContainerChar(&NewsDBName), DT_CHARPTR, ValidateNotEmpty}, - {"operserv", "exceptiondatabase", "exception.db", new ValueContainerChar(&ExceptionDBName), DT_CHARPTR, ValidateNotEmpty}, + {"operserv", "nick", "OperServ", new ValueContainerChar(&Config.s_OperServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"operserv", "description", "Operator Service", new ValueContainerChar(&Config.desc_OperServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"operserv", "globalnick", "Global", new ValueContainerChar(&Config.s_GlobalNoticer), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"operserv", "globaldescription", "Global Noticer", new ValueContainerChar(&Config.desc_GlobalNoticer), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"operserv", "database", "oper.db", new ValueContainerChar(&Config.OperDBName), DT_CHARPTR, ValidateNotEmpty}, + {"operserv", "newsdatabase", "news.db", new ValueContainerChar(&Config.NewsDBName), DT_CHARPTR, ValidateNotEmpty}, + {"operserv", "exceptiondatabase", "exception.db", new ValueContainerChar(&Config.ExceptionDBName), DT_CHARPTR, ValidateNotEmpty}, {"operserv", "modules", "", new ValueContainerString(&OperCoreModules), DT_STRING, NoValidation}, - {"operserv", "superadmin", "no", new ValueContainerBool(&SuperAdmin), DT_BOOLEAN, NoValidation}, - {"operserv", "logmaxusers", "no", new ValueContainerBool(&LogMaxUsers), DT_BOOLEAN, NoValidation}, - {"operserv", "autokillexpiry", "0", new ValueContainerTime(&AutokillExpiry), DT_TIME, ValidateNotZero}, - {"operserv", "chankillexpiry", "0", new ValueContainerTime(&ChankillExpiry), DT_TIME, ValidateNotZero}, - {"operserv", "sglineexpiry", "0", new ValueContainerTime(&SGLineExpiry), DT_TIME, ValidateNotZero}, - {"operserv", "sqlineexpiry", "0", new ValueContainerTime(&SQLineExpiry), DT_TIME, ValidateNotZero}, - {"operserv", "szlineexpiry", "0", new ValueContainerTime(&SZLineExpiry), DT_TIME, ValidateNotZero}, - {"operserv", "akillonadd", "no", new ValueContainerBool(&AkillOnAdd), DT_BOOLEAN, NoValidation}, - {"operserv", "killonsgline", "no", new ValueContainerBool(&KillonSGline), DT_BOOLEAN, NoValidation}, - {"operserv", "killonsqline", "no", new ValueContainerBool(&KillonSQline), DT_BOOLEAN, NoValidation}, + {"operserv", "superadmin", "no", new ValueContainerBool(&Config.SuperAdmin), DT_BOOLEAN, NoValidation}, + {"operserv", "logmaxusers", "no", new ValueContainerBool(&Config.LogMaxUsers), DT_BOOLEAN, NoValidation}, + {"operserv", "autokillexpiry", "0", new ValueContainerTime(&Config.AutokillExpiry), DT_TIME, ValidateNotZero}, + {"operserv", "chankillexpiry", "0", new ValueContainerTime(&Config.ChankillExpiry), DT_TIME, ValidateNotZero}, + {"operserv", "sglineexpiry", "0", new ValueContainerTime(&Config.SGLineExpiry), DT_TIME, ValidateNotZero}, + {"operserv", "sqlineexpiry", "0", new ValueContainerTime(&Config.SQLineExpiry), DT_TIME, ValidateNotZero}, + {"operserv", "szlineexpiry", "0", new ValueContainerTime(&Config.SZLineExpiry), DT_TIME, ValidateNotZero}, + {"operserv", "akillonadd", "no", new ValueContainerBool(&Config.AkillOnAdd), DT_BOOLEAN, NoValidation}, + {"operserv", "killonsgline", "no", new ValueContainerBool(&Config.KillonSGline), DT_BOOLEAN, NoValidation}, + {"operserv", "killonsqline", "no", new ValueContainerBool(&Config.KillonSQline), DT_BOOLEAN, NoValidation}, {"operserv", "notifications", "", new ValueContainerString(&OSNotifications), DT_STRING, NoValidation}, - {"operserv", "limitsessions", "no", new ValueContainerBool(&LimitSessions), DT_BOOLEAN, NoValidation}, - {"operserv", "defaultsessionlimit", "0", new ValueContainerUInt(&DefSessionLimit), DT_UINTEGER, NoValidation}, - {"operserv", "maxsessionlimit", "0", new ValueContainerUInt(&MaxSessionLimit), DT_UINTEGER, ValidateLimitSessions}, - {"operserv", "exceptionexpiry", "0", new ValueContainerTime(&ExceptionExpiry), DT_TIME, ValidateLimitSessions}, - {"operserv", "sessionlimitexceeded", "", new ValueContainerChar(&SessionLimitExceeded), DT_CHARPTR, NoValidation}, - {"operserv", "sessionlimitdetailsloc", "", new ValueContainerChar(&SessionLimitDetailsLoc), DT_CHARPTR, NoValidation}, - {"operserv", "maxsessionkill", "0", new ValueContainerInt(&MaxSessionKill), DT_INTEGER, NoValidation}, - {"operserv", "sessionautokillexpiry", "0", new ValueContainerTime(&SessionAutoKillExpiry), DT_TIME, NoValidation}, - {"operserv", "addakiller", "no", new ValueContainerBool(&AddAkiller), DT_BOOLEAN, NoValidation}, - {"operserv", "opersonly", "no", new ValueContainerBool(&OSOpersOnly), DT_BOOLEAN, NoValidation}, + {"operserv", "limitsessions", "no", new ValueContainerBool(&Config.LimitSessions), DT_BOOLEAN, NoValidation}, + {"operserv", "defaultsessionlimit", "0", new ValueContainerUInt(&Config.DefSessionLimit), DT_UINTEGER, NoValidation}, + {"operserv", "maxsessionlimit", "0", new ValueContainerUInt(&Config.MaxSessionLimit), DT_UINTEGER, ValidateLimitSessions}, + {"operserv", "exceptionexpiry", "0", new ValueContainerTime(&Config.ExceptionExpiry), DT_TIME, ValidateLimitSessions}, + {"operserv", "sessionlimitexceeded", "", new ValueContainerChar(&Config.SessionLimitExceeded), DT_CHARPTR, NoValidation}, + {"operserv", "sessionlimitdetailsloc", "", new ValueContainerChar(&Config.SessionLimitDetailsLoc), DT_CHARPTR, NoValidation}, + {"operserv", "maxsessionkill", "0", new ValueContainerInt(&Config.MaxSessionKill), DT_INTEGER, NoValidation}, + {"operserv", "sessionautokillexpiry", "0", new ValueContainerTime(&Config.SessionAutoKillExpiry), DT_TIME, NoValidation}, + {"operserv", "addakiller", "no", new ValueContainerBool(&Config.AddAkiller), DT_BOOLEAN, NoValidation}, + {"operserv", "opersonly", "no", new ValueContainerBool(&Config.OSOpersOnly), DT_BOOLEAN, NoValidation}, {"defcon", "defaultlevel", "0", new ValueContainerInt(&DefConLevel), DT_INTEGER, ValidateDefCon}, {"defcon", "level4", "", new ValueContainerString(&DefCon4), DT_STRING, ValidateDefCon}, {"defcon", "level3", "", new ValueContainerString(&DefCon3), DT_STRING, ValidateDefCon}, {"defcon", "level2", "", new ValueContainerString(&DefCon2), DT_STRING, ValidateDefCon}, {"defcon", "level1", "", new ValueContainerString(&DefCon1), DT_STRING, ValidateDefCon}, - {"defcon", "sessionlimit", "0", new ValueContainerInt(&DefConSessionLimit), DT_INTEGER, ValidateDefCon}, - {"defcon", "akillexpire", "0", new ValueContainerTime(&DefConAKILL), DT_TIME, ValidateDefCon}, - {"defcon", "chanmodes", "", new ValueContainerChar(&DefConChanModes), DT_CHARPTR, ValidateDefCon}, - {"defcon", "timeout", "0", new ValueContainerTime(&DefConTimeOut), DT_TIME, NoValidation}, - {"defcon", "globalondefcon", "no", new ValueContainerBool(&GlobalOnDefcon), DT_BOOLEAN, NoValidation}, - {"defcon", "globalondefconmore", "no", new ValueContainerBool(&GlobalOnDefconMore), DT_BOOLEAN, NoValidation}, - {"defcon", "message", "", new ValueContainerChar(&DefconMessage), DT_CHARPTR, ValidateDefCon}, - {"defcon", "offmessage", "", new ValueContainerChar(&DefConOffMessage), DT_CHARPTR, NoValidation}, - {"defcon", "akillreason", "", new ValueContainerChar(&DefConAkillReason), DT_CHARPTR, ValidateDefCon}, + {"defcon", "sessionlimit", "0", new ValueContainerInt(&Config.DefConSessionLimit), DT_INTEGER, ValidateDefCon}, + {"defcon", "akillexpire", "0", new ValueContainerTime(&Config.DefConAKILL), DT_TIME, ValidateDefCon}, + {"defcon", "chanmodes", "", new ValueContainerChar(&Config.DefConChanModes), DT_CHARPTR, ValidateDefCon}, + {"defcon", "timeout", "0", new ValueContainerTime(&Config.DefConTimeOut), DT_TIME, NoValidation}, + {"defcon", "globalondefcon", "no", new ValueContainerBool(&Config.GlobalOnDefcon), DT_BOOLEAN, NoValidation}, + {"defcon", "globalondefconmore", "no", new ValueContainerBool(&Config.GlobalOnDefconMore), DT_BOOLEAN, NoValidation}, + {"defcon", "message", "", new ValueContainerChar(&Config.DefconMessage), DT_CHARPTR, ValidateDefCon}, + {"defcon", "offmessage", "", new ValueContainerChar(&Config.DefConOffMessage), DT_CHARPTR, NoValidation}, + {"defcon", "akillreason", "", new ValueContainerChar(&Config.DefConAkillReason), DT_CHARPTR, ValidateDefCon}, {NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation} }; @@ -1747,49 +1531,49 @@ int read_config(int reload) std::list<std::pair<std::string, std::string> >::iterator it; /* Clear current opers for reload */ - for (it = svsopers_in_config.begin(); it != svsopers_in_config.end(); ++it) + for (it = Config.Opers.begin(); it != Config.Opers.end(); ++it) { std::string nick = it->first; NickCore *nc = findcore(nick.c_str()); if (nc) nc->ot = NULL; } - svsopers_in_config.clear(); + Config.Opers.clear(); - retval = serverConfig.Read(reload ? false : true); + retval = Config.Read(reload ? false : true); if (!retval) return 0; // Temporary until most of the below is modified to use the new parser -- CyberBotX if (!reload) { - if (LocalHost) { - std::list<Uplink *>::iterator curr_uplink = Uplinks.begin(), end_uplink = Uplinks.end(); + if (Config.LocalHost) { + std::list<Uplink *>::iterator curr_uplink = Config.Uplinks.begin(), end_uplink = Config.Uplinks.end(); for (; curr_uplink != end_uplink; ++curr_uplink) { Uplink *this_uplink = *curr_uplink; - if (!stricmp(LocalHost, this_uplink->host) && LocalPort == this_uplink->port) { + if (!stricmp(Config.LocalHost, this_uplink->host) && Config.LocalPort == this_uplink->port) { printf("\n<serverinfo:localhost> matches an <uplink:host> entry (%s)\nand <serverinfo:localport> matches an <uplink:port> entry (%d).\nThis will fail, you must make sure they are different.\n", this_uplink->host, this_uplink->port); retval = 0; } } } // Just in case someone put something in for <serverinfo:localport> without defining <serverinfo:localhost> too - else LocalPort = 0; + else Config.LocalPort = 0; } if (temp_nsuserhost) { if (!(s = strchr(temp_nsuserhost, '@'))) { - NSEnforcerUser = temp_nsuserhost; - NSEnforcerHost = ServiceHost; + Config.NSEnforcerUser = temp_nsuserhost; + Config.NSEnforcerHost = Config.ServiceHost; } else { *s++ = 0; - NSEnforcerUser = temp_nsuserhost; - NSEnforcerHost = s; + Config.NSEnforcerUser = temp_nsuserhost; + Config.NSEnforcerHost = s; } } if (NSDefaults.empty()) { - NSDefFlags.SetFlag(NI_SECURE); - NSDefFlags.SetFlag(NI_MEMO_SIGNON); - NSDefFlags.SetFlag(NI_MEMO_RECEIVE); + Config.NSDefFlags.SetFlag(NI_SECURE); + Config.NSDefFlags.SetFlag(NI_MEMO_SIGNON); + Config.NSDefFlags.SetFlag(NI_MEMO_RECEIVE); } else if (NSDefaults != "none") { bool hadAutoop = false; @@ -1797,58 +1581,58 @@ int read_config(int reload) std::string option; while (options.GetToken(option)) { - if (option == "kill") NSDefFlags.SetFlag(NI_KILLPROTECT); - else if (option == "killquick") NSDefFlags.SetFlag(NI_KILL_QUICK); - else if (option == "secure") NSDefFlags.SetFlag(NI_SECURE); - else if (option == "private") NSDefFlags.SetFlag(NI_PRIVATE); + if (option == "kill") Config.NSDefFlags.SetFlag(NI_KILLPROTECT); + else if (option == "killquick") Config.NSDefFlags.SetFlag(NI_KILL_QUICK); + else if (option == "secure") Config.NSDefFlags.SetFlag(NI_SECURE); + else if (option == "private") Config.NSDefFlags.SetFlag(NI_PRIVATE); else if (option == "msg") { - if (!UsePrivmsg) alog("msg in <nickserv:defaults> can only be used when UsePrivmsg is set"); - else NSDefFlags.SetFlag(NI_MSG); + if (!Config.UsePrivmsg) alog("msg in <nickserv:defaults> can only be used when UsePrivmsg is set"); + else Config.NSDefFlags.SetFlag(NI_MSG); } - else if (option == "hideemail") NSDefFlags.SetFlag(NI_HIDE_EMAIL); - else if (option == "hideusermask") NSDefFlags.SetFlag(NI_HIDE_MASK); - else if (option == "hidequit") NSDefFlags.SetFlag(NI_HIDE_QUIT); - else if (option == "memosignon") NSDefFlags.SetFlag(NI_MEMO_SIGNON); - else if (option == "memoreceive") NSDefFlags.SetFlag(NI_MEMO_RECEIVE); + else if (option == "hideemail") Config.NSDefFlags.SetFlag(NI_HIDE_EMAIL); + else if (option == "hideusermask") Config.NSDefFlags.SetFlag(NI_HIDE_MASK); + else if (option == "hidequit") Config.NSDefFlags.SetFlag(NI_HIDE_QUIT); + else if (option == "memosignon") Config.NSDefFlags.SetFlag(NI_MEMO_SIGNON); + else if (option == "memoreceive") Config.NSDefFlags.SetFlag(NI_MEMO_RECEIVE); else if (option == "autoop") hadAutoop = true; } - if (!hadAutoop) NSDefFlags.SetFlag(NI_AUTOOP); + if (!hadAutoop) Config.NSDefFlags.SetFlag(NI_AUTOOP); } if (reload) { - if ((NSDefLanguage = langlist[NSDefLanguage]) < 0) - NSDefLanguage = DEF_LANGUAGE; + if ((Config.NSDefLanguage = langlist[Config.NSDefLanguage]) < 0) + Config.NSDefLanguage = DEF_LANGUAGE; } - if (CSDefBantype < 0 || CSDefBantype > 3) { + if (Config.CSDefBantype < 0 || Config.CSDefBantype > 3) { error(0, "Value of CSDefBantype must be between 0 and 3 included"); retval = 0; } if (CSDefaults.empty()) { - CSDefFlags.SetFlag(CI_KEEPTOPIC); - CSDefFlags.SetFlag(CI_SECURE); - CSDefFlags.SetFlag(CI_SECUREFOUNDER); - CSDefFlags.SetFlag(CI_SIGNKICK); + Config.CSDefFlags.SetFlag(CI_KEEPTOPIC); + Config.CSDefFlags.SetFlag(CI_SECURE); + Config.CSDefFlags.SetFlag(CI_SECUREFOUNDER); + Config.CSDefFlags.SetFlag(CI_SIGNKICK); } else if (CSDefaults != "none") { spacesepstream options(CSDefaults); std::string option; while (options.GetToken(option)) { - if (option == "keeptopic") CSDefFlags.SetFlag(CI_KEEPTOPIC); - else if (option == "topiclock") CSDefFlags.SetFlag(CI_TOPICLOCK); - else if (option == "private") CSDefFlags.SetFlag(CI_PRIVATE); - else if (option == "restricted") CSDefFlags.SetFlag(CI_RESTRICTED); - else if (option == "secure") CSDefFlags.SetFlag(CI_SECURE); - else if (option == "secureops") CSDefFlags.SetFlag(CI_SECUREOPS); - else if (option == "securefounder") CSDefFlags.SetFlag(CI_SECUREFOUNDER); - else if (option == "signkick") CSDefFlags.SetFlag(CI_SIGNKICK); - else if (option == "signkicklevel") CSDefFlags.SetFlag(CI_SIGNKICK_LEVEL); - else if (option == "opnotice") CSDefFlags.SetFlag(CI_OPNOTICE); - else if (option == "xop") CSDefFlags.SetFlag(CI_XOP); - else if (option == "peace") CSDefFlags.SetFlag(CI_PEACE); - else if (option == "persist") CSDefFlags.SetFlag(CI_PERSIST); + if (option == "keeptopic") Config.CSDefFlags.SetFlag(CI_KEEPTOPIC); + else if (option == "topiclock") Config.CSDefFlags.SetFlag(CI_TOPICLOCK); + else if (option == "private") Config.CSDefFlags.SetFlag(CI_PRIVATE); + else if (option == "restricted") Config.CSDefFlags.SetFlag(CI_RESTRICTED); + else if (option == "secure") Config.CSDefFlags.SetFlag(CI_SECURE); + else if (option == "secureops") Config.CSDefFlags.SetFlag(CI_SECUREOPS); + else if (option == "securefounder") Config.CSDefFlags.SetFlag(CI_SECUREFOUNDER); + else if (option == "signkick") Config.CSDefFlags.SetFlag(CI_SIGNKICK); + else if (option == "signkicklevel") Config.CSDefFlags.SetFlag(CI_SIGNKICK_LEVEL); + else if (option == "opnotice") Config.CSDefFlags.SetFlag(CI_OPNOTICE); + else if (option == "xop") Config.CSDefFlags.SetFlag(CI_XOP); + else if (option == "peace") Config.CSDefFlags.SetFlag(CI_PEACE); + else if (option == "persist") Config.CSDefFlags.SetFlag(CI_PERSIST); } } @@ -1856,95 +1640,95 @@ int read_config(int reload) spacesepstream options(BSDefaults); std::string option; while (options.GetToken(option)) { - if (option == "dontkickops") BSDefFlags.SetFlag(BS_DONTKICKOPS); - else if (option == "dontkickvoices") BSDefFlags.SetFlag(BS_DONTKICKVOICES); - else if (option == "greet") BSDefFlags.SetFlag(BS_GREET); - else if (option == "fantasy") BSDefFlags.SetFlag(BS_FANTASY); - else if (option == "symbiosis") BSDefFlags.SetFlag(BS_SYMBIOSIS); + if (option == "dontkickops") Config.BSDefFlags.SetFlag(BS_DONTKICKOPS); + else if (option == "dontkickvoices") Config.BSDefFlags.SetFlag(BS_DONTKICKVOICES); + else if (option == "greet") Config.BSDefFlags.SetFlag(BS_GREET); + else if (option == "fantasy") Config.BSDefFlags.SetFlag(BS_FANTASY); + else if (option == "symbiosis") Config.BSDefFlags.SetFlag(BS_SYMBIOSIS); } } - WallOper = WallBadOS = WallOSGlobal = WallOSMode = WallOSClearmodes = WallOSKick = WallOSAkill = WallOSSGLine = WallOSSQLine = WallOSSZLine = WallOSNoOp = - WallOSJupe = WallAkillExpire = WallSGLineExpire = WallSQLineExpire = WallSZLineExpire = WallExceptionExpire = WallGetpass = WallSetpass = - WallForbid = WallDrop = false; + Config.WallOper = Config.WallBadOS = Config.WallOSGlobal = Config.WallOSMode = Config.WallOSClearmodes = Config.WallOSKick = Config.WallOSAkill = Config.WallOSSGLine = Config.WallOSSQLine = + Config.WallOSSZLine = Config.WallOSNoOp = Config.WallOSJupe = Config.WallAkillExpire = Config.WallSGLineExpire = Config.WallSQLineExpire = Config.WallSZLineExpire = Config.WallExceptionExpire = Config.WallGetpass = Config.WallSetpass = Config.WallForbid = + Config.WallDrop = false; if (!OSNotifications.empty()) { spacesepstream notifications(OSNotifications); std::string notice; while (notifications.GetToken(notice)) { - if (notice == "oper") WallOper = true; - else if (notice == "bados") WallBadOS = true; - else if (notice == "osglobal") WallOSGlobal = true; - else if (notice == "osmode") WallOSMode = true; - else if (notice == "osclearmodes") WallOSClearmodes = true; - else if (notice == "oskick") WallOSKick = true; - else if (notice == "osakill") WallOSAkill = true; - else if (notice == "ossgline") WallOSSGLine = true; - else if (notice == "ossqline") WallOSSQLine = true; - else if (notice == "osszline") WallOSSZLine = true; - else if (notice == "osnoop") WallOSNoOp = true; - else if (notice == "osjupe") WallOSJupe = true; - else if (notice == "akillexpire") WallAkillExpire = true; - else if (notice == "sglineexpire") WallSGLineExpire = true; - else if (notice == "sqlineexpire") WallSQLineExpire = true; - else if (notice == "szlineexpire") WallSZLineExpire = true; - else if (notice == "exceptionexpire") WallExceptionExpire = true; - else if (notice == "getpass") WallGetpass = true; - else if (notice == "setpass") WallSetpass = true; - else if (notice == "forbid") WallForbid = true; - else if (notice == "drop") WallDrop = true; + if (notice == "oper") Config.WallOper = true; + else if (notice == "bados") Config.WallBadOS = true; + else if (notice == "osglobal") Config.WallOSGlobal = true; + else if (notice == "osmode") Config.WallOSMode = true; + else if (notice == "osclearmodes") Config.WallOSClearmodes = true; + else if (notice == "oskick") Config.WallOSKick = true; + else if (notice == "osakill") Config.WallOSAkill = true; + else if (notice == "ossgline") Config.WallOSSGLine = true; + else if (notice == "ossqline") Config.WallOSSQLine = true; + else if (notice == "osszline") Config.WallOSSZLine = true; + else if (notice == "osnoop") Config.WallOSNoOp = true; + else if (notice == "osjupe") Config.WallOSJupe = true; + else if (notice == "akillexpire") Config.WallAkillExpire = true; + else if (notice == "sglineexpire") Config.WallSGLineExpire = true; + else if (notice == "sqlineexpire") Config.WallSQLineExpire = true; + else if (notice == "szlineexpire") Config.WallSZLineExpire = true; + else if (notice == "exceptionexpire") Config.WallExceptionExpire = true; + else if (notice == "getpass") Config.WallGetpass = true; + else if (notice == "setpass") Config.WallSetpass = true; + else if (notice == "forbid") Config.WallForbid = true; + else if (notice == "drop") Config.WallDrop = true; } } /* Ulines */ if (UlineServers) { - NumUlines = 0; + Config.NumUlines = 0; s = strtok(UlineServers, " "); do { if (s) { - NumUlines++; - Ulines = static_cast<char **>(realloc(Ulines, sizeof(char *) * NumUlines)); - Ulines[NumUlines - 1] = sstrdup(s); + Config.NumUlines++; + Config.Ulines = static_cast<char **>(realloc(Config.Ulines, sizeof(char *) * Config.NumUlines)); + Config.Ulines[Config.NumUlines - 1] = sstrdup(s); } } while ((s = strtok(NULL, " "))); } /* Modules Autoload building... :P */ - ModulesAutoLoad = BuildStringList(!Modules.empty() ? Modules : ""); - EncModuleList = BuildStringList(!EncModules.empty() ? EncModules : ""); - HostServCoreModules = BuildStringList(!HostCoreModules.empty() ? HostCoreModules : ""); - MemoServCoreModules = BuildStringList(!MemoCoreModules.empty() ? MemoCoreModules : ""); - BotServCoreModules = BuildStringList(!BotCoreModules.empty() ? BotCoreModules : ""); - OperServCoreModules = BuildStringList(!OperCoreModules.empty() ? OperCoreModules : ""); - ChanServCoreModules = BuildStringList(!ChanCoreModules.empty() ? ChanCoreModules : ""); - NickServCoreModules = BuildStringList(!NickCoreModules.empty() ? NickCoreModules : ""); - - if (LimitSessions) { - if (MaxSessionKill && !SessionAutoKillExpiry) - SessionAutoKillExpiry = 1800; /* 30 minutes */ + Config.ModulesAutoLoad = BuildStringList(!Modules.empty() ? Modules : ""); + Config.EncModuleList = BuildStringList(!EncModules.empty() ? EncModules : ""); + Config.HostServCoreModules = BuildStringList(!HostCoreModules.empty() ? HostCoreModules : ""); + Config.MemoServCoreModules = BuildStringList(!MemoCoreModules.empty() ? MemoCoreModules : ""); + Config.BotServCoreModules = BuildStringList(!BotCoreModules.empty() ? BotCoreModules : ""); + Config.OperServCoreModules = BuildStringList(!OperCoreModules.empty() ? OperCoreModules : ""); + Config.ChanServCoreModules = BuildStringList(!ChanCoreModules.empty() ? ChanCoreModules : ""); + Config.NickServCoreModules = BuildStringList(!NickCoreModules.empty() ? NickCoreModules : ""); + + if (Config.LimitSessions) { + if (Config.MaxSessionKill && !Config.SessionAutoKillExpiry) + Config.SessionAutoKillExpiry = 1800; /* 30 minutes */ } - if (s_BotServ) { - if (!BSFantasyCharacter || !*BSFantasyCharacter) - BSFantasyCharacter = sstrdup("!"); - if (*BSFantasyCharacter && (strlen(BSFantasyCharacter) > 1)) { + if (Config.s_BotServ) { + if (!Config.BSFantasyCharacter || !*Config.BSFantasyCharacter) + Config.BSFantasyCharacter = sstrdup("!"); + if (*Config.BSFantasyCharacter && (strlen(Config.BSFantasyCharacter) > 1)) { printf - ("*** BSFantasyCharacter is more than 1 character long. Only the first\n" + ("*** Config.BSFantasyCharacter is more than 1 character long. Only the first\n" "*** character ('%c') will be used. The others will be ignored.\n", - *BSFantasyCharacter); + *Config.BSFantasyCharacter); } } /* Check the user keys */ - if ((UserKey1 == UserKey2) || (UserKey1 == UserKey3) - || (UserKey3 == UserKey2)) + if ((Config.UserKey1 == Config.UserKey2) || (Config.UserKey1 == Config.UserKey3) + || (Config.UserKey3 == Config.UserKey2)) alog("Every UserKey must be different. It's for YOUR safety! Remember that!"); /** * Check all DEFCON dependiencies... **/ - if (DefConLevel) { + if (Config.DefConLevel) { /* Build DefCon's */ DefCon.reserve(6); DefCon[5].reset(); @@ -1985,16 +1769,16 @@ int read_config(int reload) { if (CheckDefCon(defconCount, DEFCON_REDUCE_SESSION)) { - CHECK(DefConSessionLimit); + CHECK(Config.DefConSessionLimit); } if (CheckDefCon(defconCount, DEFCON_AKILL_NEW_CLIENTS)) { - CHECK(DefConAKILL); - CHECK(DefConAkillReason); + CHECK(Config.DefConAKILL); + CHECK(Config.DefConAkillReason); } if (CheckDefCon(defconCount, DEFCON_FORCE_CHAN_MODES)) { - CHECK(DefConChanModes); + CHECK(Config.DefConChanModes); } } } @@ -2005,10 +1789,10 @@ int read_config(int reload) * * rob **/ - if (!NSEmailReg) { - delete [] PreNickDBName; - PreNickDBName = NULL; - NSRExpire = 0; + if (!Config.NSEmailReg) { + delete [] Config.PreNickDBName; + Config.PreNickDBName = NULL; + Config.NSRExpire = 0; } if (!retval) { diff --git a/src/configreader.cpp b/src/configreader.cpp index cb02e6002..f3356ebc3 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -13,7 +13,7 @@ #include "services.h" -ConfigReader::ConfigReader() : data(&serverConfig.config_data), errorlog(new std::ostringstream(std::stringstream::in | std::stringstream::out)), privatehash(false), error(CONF_NO_ERROR) +ConfigReader::ConfigReader() : data(&Config.config_data), errorlog(new std::ostringstream(std::stringstream::in | std::stringstream::out)), privatehash(false), error(CONF_NO_ERROR) { } @@ -27,7 +27,7 @@ ConfigReader::~ConfigReader() ConfigReader::ConfigReader(const std::string &filename) : data(new ConfigDataHash), errorlog(new std::ostringstream(std::stringstream::in | std::stringstream::out)), privatehash(true), error(CONF_NO_ERROR) { - serverConfig.ClearStack(); + Config.ClearStack(); } std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds) @@ -35,7 +35,7 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */ std::string result; - if (!serverConfig.ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds)) + if (!Config.ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds)) this->error = CONF_VALUE_NOT_FOUND; return result; @@ -48,7 +48,7 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index) { - return serverConfig.ConfValueBool(*this->data, tag, name, default_value, index); + return Config.ConfValueBool(*this->data, tag, name, default_value, index); } bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index) @@ -60,7 +60,7 @@ int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, c { int result; - if (!serverConfig.ConfValueInteger(*this->data, tag, name, default_value, index, result)) + if (!Config.ConfValueInteger(*this->data, tag, name, default_value, index, result)) { this->error = CONF_VALUE_NOT_FOUND; return 0; @@ -89,17 +89,17 @@ long ConfigReader::GetError() void ConfigReader::DumpErrors(bool bail) { - serverConfig.ReportConfigError(this->errorlog->str(), bail); + Config.ReportConfigError(this->errorlog->str(), bail); } int ConfigReader::Enumerate(const std::string &tag) { - return serverConfig.ConfValueEnum(*this->data, tag); + return Config.ConfValueEnum(*this->data, tag); } int ConfigReader::EnumerateValues(const std::string &tag, int index) { - return serverConfig.ConfVarEnum(*this->data, tag, index); + return Config.ConfVarEnum(*this->data, tag, index); } bool ConfigReader::Verify() diff --git a/src/core/bs_act.c b/src/core/bs_act.c index c30c8f62d..e321c37a9 100644 --- a/src/core/bs_act.c +++ b/src/core/bs_act.c @@ -29,19 +29,19 @@ class CommandBSAct : public Command if (!check_access(u, ci, CA_SAY)) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if (!ci->bi) { - notice_help(s_BotServ, u, BOT_NOT_ASSIGNED); + notice_help(Config.s_BotServ, u, BOT_NOT_ASSIGNED); return MOD_CONT; } - if (!ci->c || ci->c->usercount < BSMinUsers) + if (!ci->c || ci->c->usercount < Config.BSMinUsers) { - notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); + notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); return MOD_CONT; } @@ -51,19 +51,19 @@ class CommandBSAct : public Command ircdproto->SendAction(ci->bi, ci->name, "%s", message.c_str()); ci->bi->lastmsg = time(NULL); - if (LogBot && LogChannel && LogChan && !debug && findchan(LogChannel)) - ircdproto->SendPrivmsg(ci->bi, LogChannel, "ACT %s %s %s", u->nick, ci->name, message.c_str()); + if (Config.LogBot && Config.LogChannel && LogChan && !debug && findchan(Config.LogChannel)) + ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "ACT %s %s %s", u->nick, ci->name, message.c_str()); return MOD_CONT; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "ACT", BOT_ACT_SYNTAX); + syntax_error(Config.s_BotServ, u, "ACT", BOT_ACT_SYNTAX); } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_ACT); + notice_help(Config.s_BotServ, u, BOT_HELP_ACT); return true; } }; @@ -82,7 +82,7 @@ class BSAct : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_ACT); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_ACT); } }; diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index 10d224b8e..30b7ef647 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -31,13 +31,13 @@ class CommandBSAssign : public Command if (readonly) { - notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY); + notice_lang(Config.s_BotServ, u, BOT_ASSIGN_READONLY); return MOD_CONT; } if (!(bi = findbot(nick))) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, nick); return MOD_CONT; } @@ -45,36 +45,36 @@ class CommandBSAssign : public Command if (ci->botflags.HasFlag(BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->nc->HasPriv("botserv/administration"))) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if (bi->HasFlag(BI_PRIVATE) && !u->nc->HasCommand("botserv/assign/private")) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if ((ci->bi) && (stricmp(ci->bi->nick, nick) == 0)) { - notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan); + notice_lang(Config.s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan); return MOD_CONT; } bi->Assign(u, ci); - notice_lang(s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name); + notice_lang(Config.s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_ASSIGN); + notice_help(Config.s_BotServ, u, BOT_HELP_ASSIGN); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX); + syntax_error(Config.s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX); } }; @@ -92,7 +92,7 @@ class BSAssign : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_ASSIGN); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_ASSIGN); } }; diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index 6709dab0e..06f4eedd0 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -28,7 +28,7 @@ class CommandBSBadwords : public Command if (!ci->GetBadWordCount()) { - notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, ci->name); return MOD_CONT; } if (!word.empty() && strspn(word.c_str(), "1234567890,-") == word.length()) @@ -48,7 +48,7 @@ class CommandBSBadwords : public Command } } if (!sent_header) - notice_lang(s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); return MOD_CONT; } @@ -74,9 +74,9 @@ class CommandBSBadwords : public Command realword = ci::string(word, 0, pos); } - if (ci->GetBadWordCount() >= BSBadWordsMax) + if (ci->GetBadWordCount() >= Config.BSBadWordsMax) { - notice_lang(s_BotServ, u, BOT_BADWORDS_REACHED_LIMIT, BSBadWordsMax); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_REACHED_LIMIT, Config.BSBadWordsMax); return MOD_CONT; } @@ -84,17 +84,17 @@ class CommandBSBadwords : public Command { BadWord *bw = ci->GetBadWord(i); - if (!bw->word.empty() && (BSCaseSensitive && !stricmp(bw->word.c_str(), realword.c_str()) - || (!BSCaseSensitive && bw->word == realword.c_str()))) + if (!bw->word.empty() && (Config.BSCaseSensitive && !stricmp(bw->word.c_str(), realword.c_str()) + || (!Config.BSCaseSensitive && bw->word == realword.c_str()))) { - notice_lang(s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name); return MOD_CONT; } } ci->AddBadWord(realword.c_str(), type); - notice_lang(s_BotServ, u, BOT_BADWORDS_ADDED, realword.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ADDED, realword.c_str(), ci->name); return MOD_CONT; } @@ -111,20 +111,20 @@ class CommandBSBadwords : public Command { if (count == 1) { - notice_lang(s_BotServ, u, BOT_BADWORDS_NO_SUCH_ENTRY, last, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_SUCH_ENTRY, last, ci->name); } else { - notice_lang(s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); } } else if (deleted == 1) { - notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED_ONE, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_ONE, ci->name); } else { - notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL, deleted, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL, deleted, ci->name); } if (deleted) @@ -145,13 +145,13 @@ class CommandBSBadwords : public Command if (i == ci->GetBadWordCount()) { - notice_lang(s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name); return MOD_CONT; } ci->EraseBadWord(badword); - notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name); } return MOD_CONT; @@ -160,7 +160,7 @@ class CommandBSBadwords : public Command CommandReturn DoClear(User *u, ChannelInfo *ci) { ci->ClearBadWords(); - notice_lang(s_BotServ, u, BOT_BADWORDS_CLEAR); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_CLEAR); return MOD_CONT; } public: @@ -186,13 +186,13 @@ class CommandBSBadwords : public Command if (!check_access(u, ci, CA_BADWORDS) && (!need_args || !u->nc->HasPriv("botserv/administration"))) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if (readonly) { - notice_lang(s_BotServ, u, BOT_BADWORDS_DISABLED); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DISABLED); return MOD_CONT; } @@ -212,13 +212,13 @@ class CommandBSBadwords : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_BADWORDS); + notice_help(Config.s_BotServ, u, BOT_HELP_BADWORDS); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "BADWORDS", BOT_BADWORDS_SYNTAX); + syntax_error(Config.s_BotServ, u, "BADWORDS", BOT_BADWORDS_SYNTAX); } }; @@ -236,7 +236,7 @@ class BSBadwords : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_BADWORDS); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_BADWORDS); } }; @@ -261,11 +261,11 @@ int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header) if (!*sent_header) { - notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name); *sent_header = 1; } - notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_FORMAT, index + 1, bw->word.c_str(), + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_FORMAT, index + 1, bw->word.c_str(), ((bw->type == BW_SINGLE) ? "(SINGLE)" : ((bw->type == BW_START) ? "(START)" : ((bw->type == BW_END) ? "(END)" : ""))) ); diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index cba750cbe..2c0195ee4 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -29,32 +29,32 @@ class CommandBSBot : public Command if (findbot(nick)) { - notice_lang(s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick); + notice_lang(Config.s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick); return MOD_CONT; } - if (strlen(nick) > NickLen) + if (strlen(nick) > Config.NickLen) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } if (strlen(user) >= USERMAX) { - notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); + notice_lang(Config.s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); return MOD_CONT; } if (strlen(user) > HOSTMAX) { - notice_lang(s_BotServ, u, BOT_LONG_HOST, HOSTMAX); + notice_lang(Config.s_BotServ, u, BOT_LONG_HOST, HOSTMAX); return MOD_CONT; } /* Check the nick is valid re RFC 2812 */ if (isdigit(nick[0]) || nick[0] == '-') { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } @@ -62,7 +62,7 @@ class CommandBSBot : public Command { if (!isvalidnick(*ch)) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } } @@ -70,14 +70,14 @@ class CommandBSBot : public Command /* check for hardcored ircd forbidden nicks */ if (!ircdproto->IsNickValid(nick)) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } /* Check the host is valid re RFC 2812 */ if (!isValidHost(host, 3)) { - notice_lang(s_BotServ, u, BOT_BAD_HOST); + notice_lang(Config.s_BotServ, u, BOT_BAD_HOST); return MOD_CONT; } @@ -85,7 +85,7 @@ class CommandBSBot : public Command { if (!isalnum(*ch)) { - notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); + notice_lang(Config.s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); return MOD_CONT; } } @@ -97,20 +97,20 @@ class CommandBSBot : public Command */ if (findnick(nick)) { - notice_lang(s_BotServ, u, NICK_ALREADY_REGISTERED, nick); + notice_lang(Config.s_BotServ, u, NICK_ALREADY_REGISTERED, nick); return MOD_CONT; } if (!(bi = new BotInfo(nick, user, host, real))) { - notice_lang(s_BotServ, u, BOT_BOT_CREATION_FAILED); + notice_lang(Config.s_BotServ, u, BOT_BOT_CREATION_FAILED); return MOD_CONT; } /* We check whether user with this nick is online, and kill it if so */ - EnforceQlinedNick(nick, s_BotServ); + EnforceQlinedNick(nick, Config.s_BotServ); - notice_lang(s_BotServ, u, BOT_BOT_ADDED, bi->nick, bi->user, + notice_lang(Config.s_BotServ, u, BOT_BOT_ADDED, bi->nick, bi->user, bi->host, bi->real); FOREACH_MOD(I_OnBotCreate, OnBotCreate(bi)); @@ -135,37 +135,37 @@ class CommandBSBot : public Command if (!(bi = findbot(oldnick))) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); return MOD_CONT; } if (stricmp(oldnick, nick) && nickIsServices(oldnick, 0)) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); return MOD_CONT; } - if (strlen(nick) > NickLen) + if (strlen(nick) > Config.NickLen) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } if (user && strlen(user) >= USERMAX) { - notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); + notice_lang(Config.s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); return MOD_CONT; } if (host && strlen(host) > HOSTMAX) { - notice_lang(s_BotServ, u, BOT_LONG_HOST, HOSTMAX); + notice_lang(Config.s_BotServ, u, BOT_LONG_HOST, HOSTMAX); return MOD_CONT; } if (stricmp(oldnick, nick) && nickIsServices(nick, 0)) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); return MOD_CONT; } @@ -179,14 +179,14 @@ class CommandBSBot : public Command && ((host) ? !strcmp(bi->host, host) : 1) && ((real) ? !strcmp(bi->real, real) : 1)) { - notice_lang(s_BotServ, u, BOT_BOT_ANY_CHANGES); + notice_lang(Config.s_BotServ, u, BOT_BOT_ANY_CHANGES); return MOD_CONT; } /* Check the nick is valid re RFC 2812 */ if (isdigit(nick[0]) || nick[0] == '-') { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } @@ -194,7 +194,7 @@ class CommandBSBot : public Command { if (!isvalidnick(*ch)) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } } @@ -202,13 +202,13 @@ class CommandBSBot : public Command /* check for hardcored ircd forbidden nicks */ if (!ircdproto->IsNickValid(nick)) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } if (host && !isValidHost(host, 3)) { - notice_lang(s_BotServ, u, BOT_BAD_HOST); + notice_lang(Config.s_BotServ, u, BOT_BAD_HOST); return MOD_CONT; } @@ -218,7 +218,7 @@ class CommandBSBot : public Command { if (!isalnum(*ch)) { - notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); + notice_lang(Config.s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); return MOD_CONT; } } @@ -226,7 +226,7 @@ class CommandBSBot : public Command if (stricmp(bi->nick, nick) && findbot(nick)) { - notice_lang(s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick); + notice_lang(Config.s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick); return MOD_CONT; } @@ -238,7 +238,7 @@ class CommandBSBot : public Command */ if (findnick(nick)) { - notice_lang(s_BotServ, u, NICK_ALREADY_REGISTERED, nick); + notice_lang(Config.s_BotServ, u, NICK_ALREADY_REGISTERED, nick); return MOD_CONT; } @@ -250,7 +250,7 @@ class CommandBSBot : public Command } /* We check whether user with this nick is online, and kill it if so */ - EnforceQlinedNick(nick, s_BotServ); + EnforceQlinedNick(nick, Config.s_BotServ); } if (user) @@ -290,7 +290,7 @@ class CommandBSBot : public Command bi->RejoinAll(); } - notice_lang(s_BotServ, u, BOT_BOT_CHANGED, + notice_lang(Config.s_BotServ, u, BOT_BOT_CHANGED, oldnick, bi->nick, bi->user, bi->host, bi->real); FOREACH_MOD(I_OnBotChange, OnBotChange(bi)); @@ -310,13 +310,13 @@ class CommandBSBot : public Command if (!(bi = findbot(nick))) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, nick); return MOD_CONT; } if (nickIsServices(nick, 0)) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, nick); return MOD_CONT; } @@ -326,7 +326,7 @@ class CommandBSBot : public Command ircdproto->SendSQLineDel(bi->nick); delete bi; - notice_lang(s_BotServ, u, BOT_BOT_DELETED, nick); + notice_lang(Config.s_BotServ, u, BOT_BOT_DELETED, nick); return MOD_CONT; } public: @@ -341,7 +341,7 @@ class CommandBSBot : public Command if (readonly) { - notice_lang(s_BotServ, u, BOT_BOT_READONLY); + notice_lang(Config.s_BotServ, u, BOT_BOT_READONLY); return MOD_CONT; } @@ -350,7 +350,7 @@ class CommandBSBot : public Command // ADD nick user host real - 5 if (!u->nc->HasCommand("botserv/bot/add")) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -373,7 +373,7 @@ class CommandBSBot : public Command // but only oldn and newn are required if (!u->nc->HasCommand("botserv/bot/change")) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -390,7 +390,7 @@ class CommandBSBot : public Command // DEL nick if (!u->nc->HasCommand("botserv/bot/del")) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -410,13 +410,13 @@ class CommandBSBot : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_BOT); + notice_lang(Config.s_BotServ, u, BOT_SERVADMIN_HELP_BOT); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "BOT", BOT_BOT_SYNTAX); + syntax_error(Config.s_BotServ, u, "BOT", BOT_BOT_SYNTAX); } }; @@ -434,7 +434,7 @@ class BSBot : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_BOT); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_BOT); } }; diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c index 85ed84e17..afc0ba996 100644 --- a/src/core/bs_botlist.c +++ b/src/core/bs_botlist.c @@ -28,7 +28,7 @@ class CommandBSBotList : public Command BotInfo *bi; if (!nbots) { - notice_lang(s_BotServ, u, BOT_BOTLIST_EMPTY); + notice_lang(Config.s_BotServ, u, BOT_BOTLIST_EMPTY); return MOD_CONT; } @@ -36,20 +36,20 @@ class CommandBSBotList : public Command for (bi = botlists[i]; bi; bi = bi->next) { if (!(bi->HasFlag(BI_PRIVATE))) { if (!count) - notice_lang(s_BotServ, u, BOT_BOTLIST_HEADER); + notice_lang(Config.s_BotServ, u, BOT_BOTLIST_HEADER); count++; - u->SendMessage(s_BotServ, " %-15s (%s@%s)", bi->nick, bi->user, bi->host); + u->SendMessage(Config.s_BotServ, " %-15s (%s@%s)", bi->nick, bi->user, bi->host); } } } if (u->nc->HasCommand("botserv/botlist") && count < nbots) { - notice_lang(s_BotServ, u, BOT_BOTLIST_PRIVATE_HEADER); + notice_lang(Config.s_BotServ, u, BOT_BOTLIST_PRIVATE_HEADER); for (i = 0; i < 256; i++) { for (bi = botlists[i]; bi; bi = bi->next) { if (bi->HasFlag(BI_PRIVATE)) { - u->SendMessage(s_BotServ, " %-15s (%s@%s)", bi->nick, bi->user, bi->host); + u->SendMessage(Config.s_BotServ, " %-15s (%s@%s)", bi->nick, bi->user, bi->host); count++; } } @@ -57,15 +57,15 @@ class CommandBSBotList : public Command } if (!count) - notice_lang(s_BotServ, u, BOT_BOTLIST_EMPTY); + notice_lang(Config.s_BotServ, u, BOT_BOTLIST_EMPTY); else - notice_lang(s_BotServ, u, BOT_BOTLIST_FOOTER, count); + notice_lang(Config.s_BotServ, u, BOT_BOTLIST_FOOTER, count); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_BOTLIST); + notice_help(Config.s_BotServ, u, BOT_HELP_BOTLIST); return true; } }; @@ -84,7 +84,7 @@ class BSBotList : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_BOTLIST); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_BOTLIST); } }; diff --git a/src/core/bs_help.c b/src/core/bs_help.c index dcf01009c..46e845ee7 100644 --- a/src/core/bs_help.c +++ b/src/core/bs_help.c @@ -26,16 +26,16 @@ class CommandBSHelp : public Command CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { - mod_help_cmd(s_BotServ, u, BOTSERV, params[0].c_str()); + mod_help_cmd(Config.s_BotServ, u, BOTSERV, params[0].c_str()); return MOD_CONT; } void OnSyntaxError(User *u, const ci::string &subcommand) { // Abuse syntax error to display general list help. - notice_help(s_BotServ, u, BOT_HELP); + notice_help(Config.s_BotServ, u, BOT_HELP); FOREACH_MOD(I_OnBotServHelp, OnBotServHelp(u)); - notice_help(s_BotServ, u, BOT_HELP_FOOTER, BSMinUsers); + notice_help(Config.s_BotServ, u, BOT_HELP_FOOTER, Config.BSMinUsers); } }; diff --git a/src/core/bs_info.c b/src/core/bs_info.c index 82755fe32..2f2afb2d8 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -31,7 +31,7 @@ class CommandBSInfo : public Command for (ci = chanlists[i]; ci; ci = ci->next) { if (ci->bi == bi) { if (strlen(buf) + strlen(ci->name) > 300) { - u->SendMessage(s_BotServ, "%s", buf); + u->SendMessage(Config.s_BotServ, "%s", buf); *buf = 0; end = buf; } @@ -43,7 +43,7 @@ class CommandBSInfo : public Command } if (*buf) - u->SendMessage(s_BotServ, "%s", buf); + u->SendMessage(Config.s_BotServ, "%s", buf); return; } public: @@ -66,14 +66,14 @@ class CommandBSInfo : public Command { struct tm *tm; - notice_lang(s_BotServ, u, BOT_INFO_BOT_HEADER, bi->nick); - notice_lang(s_BotServ, u, BOT_INFO_BOT_MASK, bi->user, bi->host); - notice_lang(s_BotServ, u, BOT_INFO_BOT_REALNAME, bi->real); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_HEADER, bi->nick); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_MASK, bi->user, bi->host); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_REALNAME, bi->real); tm = localtime(&bi->created); strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_BotServ, u, BOT_INFO_BOT_CREATED, buf); - notice_lang(s_BotServ, u, BOT_INFO_BOT_OPTIONS, getstring(u, (bi->HasFlag(BI_PRIVATE) ? BOT_INFO_OPT_PRIVATE : BOT_INFO_OPT_NONE))); - notice_lang(s_BotServ, u, BOT_INFO_BOT_USAGE, bi->chancount); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_CREATED, buf); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_OPTIONS, getstring(u, (bi->HasFlag(BI_PRIVATE) ? BOT_INFO_OPT_PRIVATE : BOT_INFO_OPT_NONE))); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_USAGE, bi->chancount); if (u->nc->HasPriv("botserv/administration")) this->send_bot_channels(u, bi); @@ -82,109 +82,109 @@ class CommandBSInfo : public Command { if (!IsFounder(u, ci) && !u->nc->HasPriv("botserv/administration")) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } - notice_lang(s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name); + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name); if (ci->bi) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_BOT, ci->bi->nick); + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_BOT, ci->bi->nick); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_BOT_NONE); + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_BOT_NONE); if (ci->botflags.HasFlag(BS_KICK_BADWORDS)) { if (ci->ttb[TTB_BADWORDS]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_BADWORDS]); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS, getstring(u, BOT_INFO_ACTIVE)); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_BOLDS)) { if (ci->ttb[TTB_BOLDS]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_BOLDS]); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS, getstring(u, BOT_INFO_ACTIVE)); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_CAPS)) { if (ci->ttb[TTB_CAPS]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_CAPS], ci->capsmin, ci->capspercent); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_ON, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_ON, getstring(u, BOT_INFO_ACTIVE), ci->capsmin, ci->capspercent); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_OFF, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_OFF, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_COLORS)) { if (ci->ttb[TTB_COLORS]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_COLORS]); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS, getstring(u, BOT_INFO_ACTIVE)); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_FLOOD)) { if (ci->ttb[TTB_FLOOD]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_FLOOD], ci->floodlines, ci->floodsecs); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_ON, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_ON, getstring(u, BOT_INFO_ACTIVE), ci->floodlines, ci->floodsecs); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_OFF, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_OFF, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_REPEAT)) { if (ci->ttb[TTB_REPEAT]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_REPEAT], ci->repeattimes); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_ON, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_ON, getstring(u, BOT_INFO_ACTIVE), ci->repeattimes); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_OFF, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_OFF, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_REVERSES)) { if (ci->ttb[TTB_REVERSES]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_REVERSES]); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES, getstring(u, BOT_INFO_ACTIVE)); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_UNDERLINES)) { if (ci->ttb[TTB_UNDERLINES]) - notice_lang(s_BotServ, u, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_UNDERLINES]); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, getstring(u, BOT_INFO_ACTIVE)); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, getstring(u, BOT_INFO_INACTIVE)); end = buf; @@ -224,23 +224,23 @@ class CommandBSInfo : public Command getstring(u, BOT_INFO_OPT_SYMBIOSIS)); need_comma = 1; } - notice_lang(s_BotServ, u, BOT_INFO_CHAN_OPTIONS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_OPTIONS, *buf ? buf : getstring(u, BOT_INFO_OPT_NONE)); } else - notice_lang(s_BotServ, u, BOT_INFO_NOT_FOUND, query); + notice_lang(Config.s_BotServ, u, BOT_INFO_NOT_FOUND, query); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_INFO); + notice_help(Config.s_BotServ, u, BOT_HELP_INFO); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "INFO", BOT_INFO_SYNTAX); + syntax_error(Config.s_BotServ, u, "INFO", BOT_INFO_SYNTAX); } }; @@ -258,7 +258,7 @@ class BSInfo : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_INFO); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_INFO); } }; diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c index 97e36005a..daf09350a 100644 --- a/src/core/bs_kick.c +++ b/src/core/bs_kick.c @@ -34,15 +34,15 @@ class CommandBSKick : public Command ChannelInfo *ci = cs_findchan(chan); if (readonly) - notice_lang(s_BotServ, u, BOT_KICK_DISABLED); + notice_lang(Config.s_BotServ, u, BOT_KICK_DISABLED); else if (!chan || option.empty() || value.empty()) - syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX); + syntax_error(Config.s_BotServ, u, "KICK", BOT_KICK_SYNTAX); else if (value != "ON" && value != "OFF") - syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX); + syntax_error(Config.s_BotServ, u, "KICK", BOT_KICK_SYNTAX); else if (!check_access(u, ci, CA_SET) && !u->nc->HasPriv("botserv/administration")) - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); else if (!ci->bi) - notice_help(s_BotServ, u, BOT_NOT_ASSIGNED); + notice_help(Config.s_BotServ, u, BOT_NOT_ASSIGNED); else { if (option == "BADWORDS") { if (value == "ON") { @@ -59,7 +59,7 @@ class CommandBSKick : public Command } /* reset the value back to 0 - TSL */ ci->ttb[TTB_BADWORDS] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else { @@ -67,13 +67,13 @@ class CommandBSKick : public Command } ci->botflags.SetFlag(BS_KICK_BADWORDS); if (ci->ttb[TTB_BADWORDS]) - notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_BADWORDS_ON_BAN, ci->ttb[TTB_BADWORDS]); else - notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_ON); + notice_lang(Config.s_BotServ, u, BOT_KICK_BADWORDS_ON); } else { ci->botflags.UnsetFlag(BS_KICK_BADWORDS); - notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_BADWORDS_OFF); } } else if (option == "BOLDS") { if (value == "ON") { @@ -86,20 +86,20 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_BOLDS]); } ci->ttb[TTB_BOLDS] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else ci->ttb[TTB_BOLDS] = 0; ci->botflags.SetFlag(BS_KICK_BOLDS); if (ci->ttb[TTB_BOLDS]) - notice_lang(s_BotServ, u, BOT_KICK_BOLDS_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_BOLDS_ON_BAN, ci->ttb[TTB_BOLDS]); else - notice_lang(s_BotServ, u, BOT_KICK_BOLDS_ON); + notice_lang(Config.s_BotServ, u, BOT_KICK_BOLDS_ON); } else { ci->botflags.UnsetFlag(BS_KICK_BOLDS); - notice_lang(s_BotServ, u, BOT_KICK_BOLDS_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_BOLDS_OFF); } } else if (option == "CAPS") { if (value == "ON") { @@ -115,7 +115,7 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_CAPS]); } ci->ttb[TTB_CAPS] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else @@ -137,15 +137,15 @@ class CommandBSKick : public Command ci->botflags.SetFlag(BS_KICK_CAPS); if (ci->ttb[TTB_CAPS]) - notice_lang(s_BotServ, u, BOT_KICK_CAPS_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_CAPS_ON_BAN, ci->capsmin, ci->capspercent, ci->ttb[TTB_CAPS]); else - notice_lang(s_BotServ, u, BOT_KICK_CAPS_ON, + notice_lang(Config.s_BotServ, u, BOT_KICK_CAPS_ON, ci->capsmin, ci->capspercent); } else { ci->botflags.UnsetFlag(BS_KICK_CAPS); - notice_lang(s_BotServ, u, BOT_KICK_CAPS_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_CAPS_OFF); } } else if (option == "COLORS") { if (value == "ON") { @@ -158,20 +158,20 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_COLORS]); } ci->ttb[TTB_COLORS] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else ci->ttb[TTB_COLORS] = 0; ci->botflags.SetFlag(BS_KICK_COLORS); if (ci->ttb[TTB_COLORS]) - notice_lang(s_BotServ, u, BOT_KICK_COLORS_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_COLORS_ON_BAN, ci->ttb[TTB_COLORS]); else - notice_lang(s_BotServ, u, BOT_KICK_COLORS_ON); + notice_lang(Config.s_BotServ, u, BOT_KICK_COLORS_ON); } else { ci->botflags.UnsetFlag(BS_KICK_COLORS); - notice_lang(s_BotServ, u, BOT_KICK_COLORS_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_COLORS_OFF); } } else if (option == "FLOOD") { if (value == "ON") { @@ -187,7 +187,7 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_FLOOD]); } ci->ttb[TTB_FLOOD] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else @@ -204,20 +204,20 @@ class CommandBSKick : public Command ci->floodsecs = 10; else ci->floodsecs = atol(secs); - if (ci->floodsecs < 1 || ci->floodsecs > BSKeepData) + if (ci->floodsecs < 1 || ci->floodsecs > Config.BSKeepData) ci->floodsecs = 10; ci->botflags.SetFlag(BS_KICK_FLOOD); if (ci->ttb[TTB_FLOOD]) - notice_lang(s_BotServ, u, BOT_KICK_FLOOD_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_FLOOD_ON_BAN, ci->floodlines, ci->floodsecs, ci->ttb[TTB_FLOOD]); else - notice_lang(s_BotServ, u, BOT_KICK_FLOOD_ON, + notice_lang(Config.s_BotServ, u, BOT_KICK_FLOOD_ON, ci->floodlines, ci->floodsecs); } else { ci->botflags.UnsetFlag(BS_KICK_FLOOD); - notice_lang(s_BotServ, u, BOT_KICK_FLOOD_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_FLOOD_OFF); } } else if (option == "REPEAT") { if (value == "ON") { @@ -232,7 +232,7 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_REPEAT]); } ci->ttb[TTB_REPEAT] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else @@ -247,14 +247,14 @@ class CommandBSKick : public Command ci->botflags.SetFlag(BS_KICK_REPEAT); if (ci->ttb[TTB_REPEAT]) - notice_lang(s_BotServ, u, BOT_KICK_REPEAT_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_REPEAT_ON_BAN, ci->repeattimes, ci->ttb[TTB_REPEAT]); else - notice_lang(s_BotServ, u, BOT_KICK_REPEAT_ON, + notice_lang(Config.s_BotServ, u, BOT_KICK_REPEAT_ON, ci->repeattimes); } else { ci->botflags.UnsetFlag(BS_KICK_REPEAT); - notice_lang(s_BotServ, u, BOT_KICK_REPEAT_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_REPEAT_OFF); } } else if (option == "REVERSES") { if (value == "ON") { @@ -268,20 +268,20 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_REVERSES]); } ci->ttb[TTB_REVERSES] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else ci->ttb[TTB_REVERSES] = 0; ci->botflags.SetFlag(BS_KICK_REVERSES); if (ci->ttb[TTB_REVERSES]) - notice_lang(s_BotServ, u, BOT_KICK_REVERSES_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_REVERSES_ON_BAN, ci->ttb[TTB_REVERSES]); else - notice_lang(s_BotServ, u, BOT_KICK_REVERSES_ON); + notice_lang(Config.s_BotServ, u, BOT_KICK_REVERSES_ON); } else { ci->botflags.UnsetFlag(BS_KICK_REVERSES); - notice_lang(s_BotServ, u, BOT_KICK_REVERSES_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_REVERSES_OFF); } } else if (option == "UNDERLINES") { if (value == "ON") { @@ -295,23 +295,23 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_UNDERLINES]); } ci->ttb[TTB_UNDERLINES] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else ci->ttb[TTB_UNDERLINES] = 0; ci->botflags.SetFlag(BS_KICK_UNDERLINES); if (ci->ttb[TTB_UNDERLINES]) - notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_UNDERLINES_ON_BAN, ci->ttb[TTB_UNDERLINES]); else - notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_ON); + notice_lang(Config.s_BotServ, u, BOT_KICK_UNDERLINES_ON); } else { ci->botflags.UnsetFlag(BS_KICK_UNDERLINES); - notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_UNDERLINES_OFF); } } else - notice_help(s_BotServ, u, BOT_KICK_UNKNOWN, option.c_str()); + notice_help(Config.s_BotServ, u, BOT_KICK_UNKNOWN, option.c_str()); } return MOD_CONT; } @@ -319,23 +319,23 @@ class CommandBSKick : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (subcommand.empty()) - notice_help(s_BotServ, u, BOT_HELP_KICK); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK); else if (subcommand == "BADWORDS") - notice_help(s_BotServ, u, BOT_HELP_KICK_BADWORDS); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_BADWORDS); else if (subcommand == "BOLDS") - notice_help(s_BotServ, u, BOT_HELP_KICK_BOLDS); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_BOLDS); else if (subcommand == "CAPS") - notice_help(s_BotServ, u, BOT_HELP_KICK_CAPS); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_CAPS); else if (subcommand == "COLORS") - notice_help(s_BotServ, u, BOT_HELP_KICK_COLORS); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_COLORS); else if (subcommand == "FLOOD") - notice_help(s_BotServ, u, BOT_HELP_KICK_FLOOD); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_FLOOD); else if (subcommand == "REPEAT") - notice_help(s_BotServ, u, BOT_HELP_KICK_REPEAT); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_REPEAT); else if (subcommand == "REVERSES") - notice_help(s_BotServ, u, BOT_HELP_KICK_REVERSES); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_REVERSES); else if (subcommand == "UNDERLINES") - notice_help(s_BotServ, u, BOT_HELP_KICK_UNDERLINES); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_UNDERLINES); else return false; @@ -344,7 +344,7 @@ class CommandBSKick : public Command void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX); + syntax_error(Config.s_BotServ, u, "KICK", BOT_KICK_SYNTAX); } }; @@ -362,7 +362,7 @@ class BSKick : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_KICK); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_KICK); } }; diff --git a/src/core/bs_say.c b/src/core/bs_say.c index b96ae194d..7143da298 100644 --- a/src/core/bs_say.c +++ b/src/core/bs_say.c @@ -33,19 +33,19 @@ class CommandBSSay : public Command if (!check_access(u, ci, CA_SAY)) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if (!ci->bi) { - notice_help(s_BotServ, u, BOT_NOT_ASSIGNED); + notice_help(Config.s_BotServ, u, BOT_NOT_ASSIGNED); return MOD_CONT; } - if (!ci->c || ci->c->usercount < BSMinUsers) + if (!ci->c || ci->c->usercount < Config.BSMinUsers) { - notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); + notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); return MOD_CONT; } @@ -57,20 +57,20 @@ class CommandBSSay : public Command ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text); ci->bi->lastmsg = time(NULL); - if (LogBot && LogChannel && LogChan && !debug && findchan(LogChannel)) - ircdproto->SendPrivmsg(ci->bi, LogChannel, "SAY %s %s %s", u->nick, ci->name, text); + if (Config.LogBot && Config.LogChannel && LogChan && !debug && findchan(Config.LogChannel)) + ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "SAY %s %s %s", u->nick, ci->name, text); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_SAY); + notice_help(Config.s_BotServ, u, BOT_HELP_SAY); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "SAY", BOT_SAY_SYNTAX); + syntax_error(Config.s_BotServ, u, "SAY", BOT_SAY_SYNTAX); } }; @@ -88,7 +88,7 @@ class BSSay : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_SAY); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_SAY); } }; diff --git a/src/core/bs_set.c b/src/core/bs_set.c index 10375fc94..91c69122b 100644 --- a/src/core/bs_set.c +++ b/src/core/bs_set.c @@ -32,7 +32,7 @@ class CommandBSSet : public Command if (readonly) { - notice_lang(s_BotServ, u, BOT_SET_DISABLED); + notice_lang(Config.s_BotServ, u, BOT_SET_DISABLED); return MOD_CONT; } @@ -42,76 +42,76 @@ class CommandBSSet : public Command if (!(bi = findbot(chan))) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, chan); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, chan); return MOD_CONT; } if (value == "ON") { bi->SetFlag(BI_PRIVATE); - notice_lang(s_BotServ, u, BOT_SET_PRIVATE_ON, bi->nick); + notice_lang(Config.s_BotServ, u, BOT_SET_PRIVATE_ON, bi->nick); } else if (value == "OFF") { bi->UnsetFlag(BI_PRIVATE); - notice_lang(s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick); + notice_lang(Config.s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick); } else { - syntax_error(s_BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX); + syntax_error(Config.s_BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX); } return MOD_CONT; } else if (!(ci = cs_findchan(chan))) - notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan); + notice_lang(Config.s_BotServ, u, CHAN_X_NOT_REGISTERED, chan); else if (!u->nc->HasPriv("botserv/administration") && !check_access(u, ci, CA_SET)) - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); else { if (option == "DONTKICKOPS") { if (value == "ON") { ci->botflags.SetFlag(BS_DONTKICKOPS); - notice_lang(s_BotServ, u, BOT_SET_DONTKICKOPS_ON, + notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_DONTKICKOPS); - notice_lang(s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, + notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET DONTKICKOPS", + syntax_error(Config.s_BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX); } } else if (option == "DONTKICKVOICES") { if (value == "ON") { ci->botflags.SetFlag(BS_DONTKICKVOICES); - notice_lang(s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, + notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_DONTKICKVOICES); - notice_lang(s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, + notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET DONTKICKVOICES", + syntax_error(Config.s_BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX); } } else if (option == "FANTASY") { if (value == "ON") { ci->botflags.SetFlag(BS_FANTASY); - notice_lang(s_BotServ, u, BOT_SET_FANTASY_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_FANTASY); - notice_lang(s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET FANTASY", + syntax_error(Config.s_BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX); } } else if (option == "GREET") { if (value == "ON") { ci->botflags.SetFlag(BS_GREET); - notice_lang(s_BotServ, u, BOT_SET_GREET_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_GREET_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_GREET); - notice_lang(s_BotServ, u, BOT_SET_GREET_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_GREET_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET GREET", + syntax_error(Config.s_BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX); } } else if (u->nc->HasCommand("botserv/set/nobot") && option == "NOBOT") { @@ -119,27 +119,27 @@ class CommandBSSet : public Command ci->botflags.SetFlag(BS_NOBOT); if (ci->bi) ci->bi->UnAssign(u, ci); - notice_lang(s_BotServ, u, BOT_SET_NOBOT_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_NOBOT); - notice_lang(s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET NOBOT", + syntax_error(Config.s_BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX); } } else if (option == "SYMBIOSIS") { if (value == "ON") { ci->botflags.SetFlag(BS_SYMBIOSIS); - notice_lang(s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_SYMBIOSIS); - notice_lang(s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET SYMBIOSIS", + syntax_error(Config.s_BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX); } } else { - notice_help(s_BotServ, u, BOT_SET_UNKNOWN, option.c_str()); + notice_help(Config.s_BotServ, u, BOT_SET_UNKNOWN, option.c_str()); } } return MOD_CONT; @@ -149,24 +149,24 @@ class CommandBSSet : public Command { if (subcommand.empty()) { - notice_help(s_BotServ, u, BOT_HELP_SET); + notice_help(Config.s_BotServ, u, BOT_HELP_SET); if (u->nc && u->nc->IsServicesOper()) - notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET); + notice_help(Config.s_BotServ, u, BOT_SERVADMIN_HELP_SET); } else if (subcommand == "DONTKICKOPS") - notice_help(s_BotServ, u, BOT_HELP_SET_DONTKICKOPS); + notice_help(Config.s_BotServ, u, BOT_HELP_SET_DONTKICKOPS); else if (subcommand == "DONTKICKVOICES") - notice_help(s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES); + notice_help(Config.s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES); else if (subcommand == "FANTASY") - notice_help(s_BotServ, u, BOT_HELP_SET_FANTASY); + notice_help(Config.s_BotServ, u, BOT_HELP_SET_FANTASY); else if (subcommand == "GREET") - notice_help(s_BotServ, u, BOT_HELP_SET_GREET); + notice_help(Config.s_BotServ, u, BOT_HELP_SET_GREET); else if (subcommand == "SYMBIOSIS") - notice_lang(s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, s_ChanServ); + notice_lang(Config.s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, Config.s_ChanServ); else if (subcommand == "NOBOT") - notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT); + notice_lang(Config.s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT); else if (subcommand == "PRIVATE") - notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE); + notice_lang(Config.s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE); else return false; @@ -175,7 +175,7 @@ class CommandBSSet : public Command void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "SET", BOT_SET_SYNTAX); + syntax_error(Config.s_BotServ, u, "SET", BOT_SET_SYNTAX); } }; class BSSet : public Module @@ -192,7 +192,7 @@ class BSSet : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_SET); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_SET); } }; diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c index bf4b01654..fcd2ee8f1 100644 --- a/src/core/bs_unassign.c +++ b/src/core/bs_unassign.c @@ -29,30 +29,30 @@ class CommandBSUnassign : public Command ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PERM); if (readonly) - notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY); + notice_lang(Config.s_BotServ, u, BOT_ASSIGN_READONLY); else if (!u->nc->HasPriv("botserv/administration") && !check_access(u, ci, CA_ASSIGN)) - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); else if (!ci->bi) - notice_help(s_BotServ, u, BOT_NOT_ASSIGNED); + notice_help(Config.s_BotServ, u, BOT_NOT_ASSIGNED); else if (ci->HasFlag(CI_PERSIST) && !cm) - notice_help(s_BotServ, u, BOT_UNASSIGN_PERSISTANT_CHAN); + notice_help(Config.s_BotServ, u, BOT_UNASSIGN_PERSISTANT_CHAN); else { ci->bi->UnAssign(u, ci); - notice_lang(s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name); + notice_lang(Config.s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_UNASSIGN); + notice_help(Config.s_BotServ, u, BOT_HELP_UNASSIGN); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "UNASSIGN", BOT_UNASSIGN_SYNTAX); + syntax_error(Config.s_BotServ, u, "UNASSIGN", BOT_UNASSIGN_SYNTAX); } }; @@ -70,7 +70,7 @@ class BSUnassign : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_UNASSIGN); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_UNASSIGN); } }; diff --git a/src/core/cs_access.c b/src/core/cs_access.c index 08680a989..5f875b1c9 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -57,17 +57,17 @@ static int access_list(User * u, int index, ChannelInfo * ci, int *sent_header) if (!*sent_header) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); *sent_header = 1; } if (ci->HasFlag(CI_XOP)) { xop = get_xop_level(access->level); - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_XOP_FORMAT, index + 1, xop, access->nc->display); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_XOP_FORMAT, index + 1, xop, access->nc->display); } else - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_AXS_FORMAT, index + 1, access->level, access->nc->display); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_AXS_FORMAT, index + 1, access->level, access->nc->display); return 1; } @@ -92,7 +92,7 @@ static int access_view(User *u, int index, ChannelInfo *ci, int *sent_header) if (!*sent_header) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); *sent_header = 1; } @@ -110,10 +110,10 @@ static int access_view(User *u, int index, ChannelInfo *ci, int *sent_header) if (ci->HasFlag(CI_XOP)) { xop = get_xop_level(access->level); - notice_lang(s_ChanServ, u, CHAN_ACCESS_VIEW_XOP_FORMAT, index + 1, xop, access->nc->display, access->creator.c_str(), timebuf); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_VIEW_XOP_FORMAT, index + 1, xop, access->nc->display, access->creator.c_str(), timebuf); } else - notice_lang(s_ChanServ, u, CHAN_ACCESS_VIEW_AXS_FORMAT, index + 1, access->level, access->nc->display, access->creator.c_str(), timebuf); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_VIEW_AXS_FORMAT, index + 1, access->level, access->nc->display, access->creator.c_str(), timebuf); return 1; } @@ -158,21 +158,21 @@ class CommandCSAccess : public Command else if ((ci->HasFlag(CI_XOP)) && !is_list) { if (ModeManager::FindChannelModeByName(CMODE_HALFOP)) - notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP_HOP, s_ChanServ); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_XOP_HOP, Config.s_ChanServ); else - notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP, s_ChanServ); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_XOP, Config.s_ChanServ); } else if (( (is_list && !check_access(u, ci, CA_ACCESS_LIST) && !u->nc->HasCommand("chanserv/access/list")) || (!is_list && !check_access(u, ci, CA_ACCESS_CHANGE) && !u->nc->HasPriv("chanserv/access/modify")) )) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (cmd == "ADD") { if (readonly) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DISABLED); return MOD_CONT; } @@ -181,30 +181,30 @@ class CommandCSAccess : public Command if (level >= ulev && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } if (!level) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_NONZERO); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_NONZERO); return MOD_CONT; } else if (level <= ACCESS_INVALID || level >= ACCESS_FOUNDER) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); return MOD_CONT; } na = findnick(nick); if (!na) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_NICKS_ONLY); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NICKS_ONLY); return MOD_CONT; } else if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, nick); + notice_lang(Config.s_ChanServ, u, NICK_X_FORBIDDEN, nick); return MOD_CONT; } @@ -215,26 +215,26 @@ class CommandCSAccess : public Command /* Don't allow lowering from a level >= ulev */ if (access->level >= ulev && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } if (access->level == level) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_UNCHANGED, access->nc->display, chan, level); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_UNCHANGED, access->nc->display, chan, level); return MOD_CONT; } access->level = level; FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nick, level)); - alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, access->level, na->nick, nc->display, ci->name); - notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED, nc->display, chan, level); + alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, access->level, na->nick, nc->display, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED, nc->display, chan, level); return MOD_CONT; } - if (ci->GetAccessCount() >= CSAccessMax) + if (ci->GetAccessCount() >= Config.CSAccessMax) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_REACHED_LIMIT, CSAccessMax); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_REACHED_LIMIT, Config.CSAccessMax); return MOD_CONT; } @@ -243,21 +243,21 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na->nick, level)); - alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name); - notice_lang(s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name, level); + alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name, level); } else if (cmd == "DEL") { int deleted; if (readonly) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DISABLED); return MOD_CONT; } if (!ci->GetAccessCount()) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan); return MOD_CONT; } @@ -269,22 +269,22 @@ class CommandCSAccess : public Command if (!deleted) { if (perm) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (count == 1) { last = atoi(nick); - notice_lang(s_ChanServ, u, CHAN_ACCESS_NO_SUCH_ENTRY, last, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_SUCH_ENTRY, last, ci->name); } else - notice_lang(s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name); } else { - alog("%s: %s!%s@%s (level %d) deleted access of user%s %s on %s", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), deleted == 1 ? "" : "s", nick, chan); + alog("%s: %s!%s@%s (level %d) deleted access of user%s %s on %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), deleted == 1 ? "" : "s", nick, chan); if (deleted == 1) - notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED_ONE, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_ONE, ci->name); else - notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL, deleted, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL, deleted, ci->name); } } else @@ -292,25 +292,25 @@ class CommandCSAccess : public Command na = findnick(nick); if (!na) { - notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_REGISTERED, nick); return MOD_CONT; } nc = na->nc; access = ci->GetAccess(nc); if (!access) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_NOT_FOUND, nick, chan); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NOT_FOUND, nick, chan); return MOD_CONT; } if (get_access(u, ci) <= access->level && !u->nc->HasPriv("chanserv/access/modify")) { deleted = 0; - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else { - notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED, access->nc->display, ci->name); - alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), na->nick, access->nc->display, chan); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED, access->nc->display, ci->name); + alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), na->nick, access->nc->display, chan); access->nc = NULL; access->in_use = 0; deleted = 1; @@ -338,7 +338,7 @@ class CommandCSAccess : public Command if (!ci->GetAccessCount()) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan); return MOD_CONT; } if (nick && strspn(nick, "1234567890,-") == strlen(nick)) @@ -354,9 +354,9 @@ class CommandCSAccess : public Command } } if (!sent_header) - notice_lang(s_ChanServ, u, CHAN_ACCESS_NO_MATCH, chan); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, chan); else - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name); } else if (cmd == "VIEW") { @@ -364,7 +364,7 @@ class CommandCSAccess : public Command if (!ci->GetAccessCount()) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, chan); return MOD_CONT; } if (nick && strspn(nick, "1234567890,-") == strlen(nick)) @@ -380,21 +380,21 @@ class CommandCSAccess : public Command } } if (!sent_header) - notice_lang(s_ChanServ, u, CHAN_ACCESS_NO_MATCH, chan); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, chan); else - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name); } else if (cmd == "CLEAR") { if (readonly) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DISABLED); return MOD_CONT; } if (!IsFounder(u, ci) && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -402,9 +402,9 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u)); - notice_lang(s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name); alog("%s: %s!%s@%s (level %d) cleared access list on %s", - s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, + Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), chan); } @@ -415,14 +415,14 @@ class CommandCSAccess : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_ACCESS); - notice_help(s_ChanServ, u, CHAN_HELP_ACCESS_LEVELS); + notice_help(Config.s_ChanServ, u, CHAN_HELP_ACCESS); + notice_help(Config.s_ChanServ, u, CHAN_HELP_ACCESS_LEVELS); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "ACCESS", CHAN_ACCESS_SYNTAX); + syntax_error(Config.s_ChanServ, u, "ACCESS", CHAN_ACCESS_SYNTAX); } }; @@ -452,9 +452,9 @@ class CommandCSLevels : public Command if (cmd == "SET" ? !s : (cmd.substr(0, 3) == "DIS" ? (!what || s) : !!what)) this->OnSyntaxError(u, cmd); else if (ci->HasFlag(CI_XOP)) - notice_lang(s_ChanServ, u, CHAN_LEVELS_XOP); + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_XOP); else if (!IsFounder(u, ci) && !u->nc->HasPriv("chanserv/access/modify")) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (cmd == "SET") { level = strtol(s, &error, 10); @@ -464,7 +464,7 @@ class CommandCSLevels : public Command } if (level <= ACCESS_INVALID || level >= ACCESS_FOUNDER) { - notice_lang(s_ChanServ, u, CHAN_LEVELS_RANGE, + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); return MOD_CONT; } @@ -474,15 +474,15 @@ class CommandCSLevels : public Command ci->levels[levelinfo[i].what] = level; alog("%s: %s!%s@%s set level %s on channel %s to %d", - s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, + Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, levelinfo[i].name, ci->name, level); - notice_lang(s_ChanServ, u, CHAN_LEVELS_CHANGED, + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_CHANGED, levelinfo[i].name, chan, level); return MOD_CONT; } } - notice_lang(s_ChanServ, u, CHAN_LEVELS_UNKNOWN, what, s_ChanServ); + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_UNKNOWN, what, Config.s_ChanServ); } else if (cmd == "DIS" || cmd == "DISABLE") { for (i = 0; levelinfo[i].what >= 0; i++) { @@ -490,17 +490,17 @@ class CommandCSLevels : public Command ci->levels[levelinfo[i].what] = ACCESS_INVALID; alog("%s: %s!%s@%s disabled level %s on channel %s", - s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, + Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, levelinfo[i].name, ci->name); - notice_lang(s_ChanServ, u, CHAN_LEVELS_DISABLED, + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_DISABLED, levelinfo[i].name, chan); return MOD_CONT; } } - notice_lang(s_ChanServ, u, CHAN_LEVELS_UNKNOWN, what, s_ChanServ); + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_UNKNOWN, what, Config.s_ChanServ); } else if (cmd == "LIST") { - notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_HEADER, chan); + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_LIST_HEADER, chan); if (!levelinfo_maxwidth) { for (i = 0; levelinfo[i].what >= 0; i++) { @@ -518,17 +518,17 @@ class CommandCSLevels : public Command if (j == CA_AUTOOP || j == CA_AUTODEOP || j == CA_AUTOVOICE || j == CA_NOJOIN) { - notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_DISABLED, + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_LIST_DISABLED, levelinfo_maxwidth, levelinfo[i].name); } else { - notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_DISABLED, + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_LIST_DISABLED, levelinfo_maxwidth, levelinfo[i].name); } } else if (j == ACCESS_FOUNDER) { - notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_FOUNDER, + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_LIST_FOUNDER, levelinfo_maxwidth, levelinfo[i].name); } else { - notice_lang(s_ChanServ, u, CHAN_LEVELS_LIST_NORMAL, + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_LIST_NORMAL, levelinfo_maxwidth, levelinfo[i].name, j); } } @@ -537,8 +537,8 @@ class CommandCSLevels : public Command reset_levels(ci); alog("%s: %s!%s@%s reset levels definitions on channel %s", - s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ci->name); - notice_lang(s_ChanServ, u, CHAN_LEVELS_RESET, chan); + Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_RESET, chan); } else { this->OnSyntaxError(u, ""); } @@ -547,13 +547,13 @@ class CommandCSLevels : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_LEVELS); + notice_help(Config.s_ChanServ, u, CHAN_HELP_LEVELS); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX); + syntax_error(Config.s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX); } }; @@ -574,8 +574,8 @@ class CSAccess : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ACCESS); - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LEVELS); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_ACCESS); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_LEVELS); } }; diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c index 13bbad0a2..fcc335cb8 100644 --- a/src/core/cs_akick.c +++ b/src/core/cs_akick.c @@ -68,11 +68,11 @@ int akick_list(User * u, int index, ChannelInfo * ci, int *sent_header) if (!akick->InUse) return 0; if (!*sent_header) { - notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name); *sent_header = 1; } - notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_FORMAT, index + 1, + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_FORMAT, index + 1, ((akick->HasFlag(AK_ISNICK)) ? akick->nc-> display : akick->mask.c_str()), (!akick->reason.empty() ? akick-> @@ -98,7 +98,7 @@ int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header) if (!akick->InUse) return 0; if (!*sent_header) { - notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name); *sent_header = 1; } @@ -110,7 +110,7 @@ int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header) snprintf(timebuf, sizeof(timebuf), "%s", getstring(u, UNKNOWN)); } - notice_lang(s_ChanServ, u, (akick->HasFlag(AK_STUCK) ? CHAN_AKICK_VIEW_FORMAT_STUCK : CHAN_AKICK_VIEW_FORMAT), index + 1, + notice_lang(Config.s_ChanServ, u, (akick->HasFlag(AK_STUCK) ? CHAN_AKICK_VIEW_FORMAT_STUCK : CHAN_AKICK_VIEW_FORMAT), index + 1, ((akick->HasFlag(AK_ISNICK)) ? akick->nc->display : akick->mask.c_str()), !akick->creator.empty() ? akick->creator.c_str() : getstring(u, UNKNOWN), timebuf, (!akick->reason.empty() ? akick->reason.c_str() : getstring(u, NO_REASON))); @@ -162,7 +162,7 @@ class CommandCSAKick : public Command { if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, mask.c_str()); + notice_lang(Config.s_ChanServ, u, NICK_X_FORBIDDEN, mask.c_str()); return; } @@ -174,7 +174,7 @@ class CommandCSAKick : public Command { if (is_excepted_mask(ci, mask.c_str())) { - notice_lang(s_ChanServ, u, CHAN_EXCEPTED, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_EXCEPTED, mask.c_str(), ci->name); return; } } @@ -185,7 +185,7 @@ class CommandCSAKick : public Command { if ((nc == ci->founder) || (get_access_nc(nc, ci) >= get_access(u, ci))) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return; } } @@ -202,7 +202,7 @@ class CommandCSAKick : public Command { if (match_usermask(mask.c_str(), u2)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return; } } @@ -224,7 +224,7 @@ class CommandCSAKick : public Command snprintf(buf, BUFSIZE, "%s!%s", na2->nick, na2->last_usermask); if (Anope::Match(buf, mask.c_str(), false)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return; } } @@ -239,17 +239,15 @@ class CommandCSAKick : public Command continue; if ((akick->HasFlag(AK_ISNICK)) ? akick->nc == nc : akick->mask == mask) { - notice_lang(s_ChanServ, u, CHAN_AKICK_ALREADY_EXISTS, (akick->HasFlag(AK_ISNICK)) ? akick->nc->display : akick->mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_ALREADY_EXISTS, (akick->HasFlag(AK_ISNICK)) ? akick->nc->display : akick->mask.c_str(), ci->name); return; } } - /* All entries should be in use so we don't have to go over - * the entire list. We simply add new entries at the end. */ - if (ci->GetAkickCount() >= CSAutokickMax) + if (ci->GetAkickCount() >= Config.CSAutokickMax) { - notice_lang(s_ChanServ, u, CHAN_AKICK_REACHED_LIMIT, CSAutokickMax); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_REACHED_LIMIT, Config.CSAutokickMax); return; } @@ -258,7 +256,7 @@ class CommandCSAKick : public Command else akick = ci->AddAkick(u->nick, mask.c_str(), !reason.empty() ? reason.c_str() : ""); - notice_lang(s_ChanServ, u, CHAN_AKICK_ADDED, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_ADDED, mask.c_str(), ci->name); this->DoEnforce(u, ci, params); } @@ -273,7 +271,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); return; } @@ -292,12 +290,12 @@ class CommandCSAKick : public Command if (i == ci->GetAkickCount()) { - notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name); return; } akick->SetFlag(AK_STUCK); - notice_lang(s_ChanServ, u, CHAN_AKICK_STUCK, akick->mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_STUCK, akick->mask.c_str(), ci->name); if (ci->c) stick_mask(ci, akick); @@ -313,7 +311,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); return; } @@ -332,12 +330,12 @@ class CommandCSAKick : public Command if (i == ci->GetAkickCount()) { - notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name); return; } akick->UnsetFlag(AK_STUCK); - notice_lang(s_ChanServ, u, CHAN_AKICK_UNSTUCK, akick->mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_UNSTUCK, akick->mask.c_str(), ci->name); } void DoDel(User *u, ChannelInfo *ci, const std::vector<ci::string> ¶ms) @@ -348,7 +346,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); return; } @@ -362,14 +360,14 @@ class CommandCSAKick : public Command if (!deleted) { if (count == 1) - notice_lang(s_ChanServ, u, CHAN_AKICK_NO_SUCH_ENTRY, last, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_SUCH_ENTRY, last, ci->name); else - notice_lang(s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name); } else if (deleted == 1) - notice_lang(s_ChanServ, u, CHAN_AKICK_DELETED_ONE, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_DELETED_ONE, ci->name); else - notice_lang(s_ChanServ, u, CHAN_AKICK_DELETED_SEVERAL, deleted, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_DELETED_SEVERAL, deleted, ci->name); if (deleted) ci->CleanAkick(); } @@ -392,13 +390,13 @@ class CommandCSAKick : public Command if (i == ci->GetAkickCount()) { - notice_lang(s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name); return; } ci->EraseAkick(akick); - notice_lang(s_ChanServ, u, CHAN_AKICK_DELETED, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_DELETED, mask.c_str(), ci->name); } } @@ -411,7 +409,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); return; } @@ -437,7 +435,7 @@ class CommandCSAKick : public Command } if (!sent_header) - notice_lang(s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name); } @@ -450,7 +448,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); return; } @@ -475,7 +473,7 @@ class CommandCSAKick : public Command } } if (!sent_header) - notice_lang(s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name); } @@ -488,7 +486,7 @@ class CommandCSAKick : public Command if (!c) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, ci->name); return; } @@ -501,9 +499,9 @@ class CommandCSAKick : public Command { argv[0] = sstrdup(c->name); argv[1] = sstrdup(cu->user->nick); - argv[2] = sstrdup(CSAutokickReason); + argv[2] = sstrdup(Config.CSAutokickReason); - do_kick(s_ChanServ, 3, argv); + do_kick(Config.s_ChanServ, 3, argv); delete [] argv[2]; delete [] argv[1]; @@ -513,13 +511,13 @@ class CommandCSAKick : public Command cu = unext; } - notice_lang(s_ChanServ, u, CHAN_AKICK_ENFORCE_DONE, ci->name, count); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_ENFORCE_DONE, ci->name, count); } void DoClear(User *u, ChannelInfo *ci, const std::vector<ci::string> ¶ms) { ci->ClearAkick(); - notice_lang(s_ChanServ, u, CHAN_AKICK_CLEAR, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_CLEAR, ci->name); } public: @@ -538,9 +536,9 @@ class CommandCSAKick : public Command if (mask.empty() && (cmd == "ADD" || cmd == "STICK" || cmd == "UNSTICK" || cmd == "DEL")) this->OnSyntaxError(u, cmd); else if (!check_access(u, ci, CA_AKICK) && !u->nc->HasPriv("chanserv/access/modify")) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (cmd != "LIST" && cmd != "VIEW" && cmd != "ENFORCE" && readonly) - notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_DISABLED); else if (cmd == "ADD") this->DoAdd(u, ci, params); else if (cmd == "STICK") @@ -565,13 +563,13 @@ class CommandCSAKick : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_AKICK); + notice_help(Config.s_ChanServ, u, CHAN_HELP_AKICK); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX); + syntax_error(Config.s_ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX); } }; @@ -592,7 +590,7 @@ class CSAKick : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AKICK); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_AKICK); } }; diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index e8a49407c..86ed13332 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -48,23 +48,23 @@ class CommandCSBan : public Command ci = c->ci; if (!c) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); } else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) { - notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, target); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, target); } else if (!is_same ? !check_access(u, ci, CA_BAN) : !check_access(u, ci, CA_BANME)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else if (!is_same && (ci->HasFlag(CI_PEACE)) && (get_access(u2, ci) >= get_access(u, ci))) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); /* * Dont ban/kick the user on channels where he is excepted * to prevent services <-> server wars. */ } else if (ModeManager::FindChannelModeByName(CMODE_EXCEPT) && is_excepted(ci, u2)) { - notice_lang(s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name); } else if (is_protected(u2)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else { const char *av[3]; char mask[BUFSIZE]; @@ -73,7 +73,7 @@ class CommandCSBan : public Command get_idealban(ci, u2, mask, sizeof(mask)); av[1] = mask; ircdproto->SendMode(whosends(ci), c->name, "+b %s", av[1]); - chan_set_modes(s_ChanServ, c, 2, av, 1); + chan_set_modes(Config.s_ChanServ, c, 2, av, 1); /* We still allow host banning while not allowing to kick */ if (!is_on_chan(c, u2)) @@ -91,7 +91,7 @@ class CommandCSBan : public Command kav[0] = ci->name; kav[1] = target; kav[2] = reason; - do_kick(s_ChanServ, 3, kav); + do_kick(Config.s_ChanServ, 3, kav); } return MOD_CONT; @@ -99,13 +99,13 @@ class CommandCSBan : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_BAN); + notice_help(Config.s_ChanServ, u, CHAN_HELP_BAN); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "BAN", CHAN_BAN_SYNTAX); + syntax_error(Config.s_ChanServ, u, "BAN", CHAN_BAN_SYNTAX); } }; @@ -127,7 +127,7 @@ class CommandCSUnban : public Command if (!(c = findchan(chan))) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); return MOD_CONT; } @@ -135,24 +135,24 @@ class CommandCSUnban : public Command if (!check_access(u, ci, CA_UNBAN)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } common_unban(ci, u->nick); - notice_lang(s_ChanServ, u, CHAN_UNBANNED, chan); + notice_lang(Config.s_ChanServ, u, CHAN_UNBANNED, chan); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_UNBAN); + notice_help(Config.s_ChanServ, u, CHAN_HELP_UNBAN); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "UNBAN", CHAN_UNBAN_SYNTAX); + syntax_error(Config.s_ChanServ, u, "UNBAN", CHAN_UNBAN_SYNTAX); } }; @@ -173,8 +173,8 @@ class CSBan : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_BAN); - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNBAN); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_BAN); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_UNBAN); } }; diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c index b89c68a8b..ea01eb90e 100644 --- a/src/core/cs_clear.c +++ b/src/core/cs_clear.c @@ -39,28 +39,28 @@ class CommandCSClear : public Command ci = c->ci; if (!c) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); } else if (!u || !check_access(u, ci, CA_CLEAR)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else if (what == "bans") { c->ClearBans(); - notice_lang(s_ChanServ, u, CHAN_CLEARED_BANS, chan); + notice_lang(Config.s_ChanServ, u, CHAN_CLEARED_BANS, chan); } else if (ModeManager::FindChannelModeByName(CMODE_EXCEPT) && what == "excepts") { c->ClearExcepts(); - notice_lang(s_ChanServ, u, CHAN_CLEARED_EXCEPTS, chan); + notice_lang(Config.s_ChanServ, u, CHAN_CLEARED_EXCEPTS, chan); } else if (ModeManager::FindChannelModeByName(CMODE_INVITE) && what == "invites") { c->ClearInvites(); - notice_lang(s_ChanServ, u, CHAN_CLEARED_INVITES, chan); + notice_lang(Config.s_ChanServ, u, CHAN_CLEARED_INVITES, chan); } else if (what == "modes") { c->ClearModes(); check_modes(c); - notice_lang(s_ChanServ, u, CHAN_CLEARED_MODES, chan); + notice_lang(Config.s_ChanServ, u, CHAN_CLEARED_MODES, chan); } else if (what == "ops") { const char *av[6]; /* The max we have to hold: chan, ts, modes(max3), nick, nick, nick */ int ac, isop, isadmin, isown, count, i; @@ -111,7 +111,7 @@ class CommandCSClear : public Command ac = 2 + i; } - do_cmode(s_ChanServ, ac, av); + do_cmode(Config.s_ChanServ, ac, av); } } else { av[0] = chan; @@ -151,10 +151,10 @@ class CommandCSClear : public Command ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1], tmp2); } - do_cmode(s_ChanServ, ac, av); + do_cmode(Config.s_ChanServ, ac, av); } } - notice_lang(s_ChanServ, u, CHAN_CLEARED_OPS, chan); + notice_lang(Config.s_ChanServ, u, CHAN_CLEARED_OPS, chan); } else if (ModeManager::FindChannelModeByName(CMODE_HALFOP) && what == "hops") { const char *av[4]; int ac; @@ -186,7 +186,7 @@ class CommandCSClear : public Command else ircdproto->SendSVSModeChan(av[0], av[1], NULL); - do_cmode(s_ChanServ, ac, av); + do_cmode(Config.s_ChanServ, ac, av); break; } else { if (ircdcap->tsmode) @@ -196,9 +196,9 @@ class CommandCSClear : public Command ircdproto->SendMode(whosends(ci), av[0], "%s %s", av[1], av[2]); } - do_cmode(s_ChanServ, ac, av); + do_cmode(Config.s_ChanServ, ac, av); } - notice_lang(s_ChanServ, u, CHAN_CLEARED_HOPS, chan); + notice_lang(Config.s_ChanServ, u, CHAN_CLEARED_HOPS, chan); } else if (what == "voices") { const char *av[4]; int ac; @@ -230,7 +230,7 @@ class CommandCSClear : public Command else ircdproto->SendSVSModeChan(av[0], av[1], NULL); - do_cmode(s_ChanServ, ac, av); + do_cmode(Config.s_ChanServ, ac, av); break; } else { if (ircdcap->tsmode) { @@ -241,9 +241,9 @@ class CommandCSClear : public Command av[2]); } } - do_cmode(s_ChanServ, ac, av); + do_cmode(Config.s_ChanServ, ac, av); } - notice_lang(s_ChanServ, u, CHAN_CLEARED_VOICES, chan); + notice_lang(Config.s_ChanServ, u, CHAN_CLEARED_VOICES, chan); } else if (what == "users") { const char *av[3]; struct c_userlist *cu, *bnext; @@ -257,27 +257,27 @@ class CommandCSClear : public Command av[1] = sstrdup(cu->user->nick); av[2] = sstrdup(buf); ircdproto->SendKick(whosends(ci), av[0], av[1], av[2]); - do_kick(s_ChanServ, 3, av); + do_kick(Config.s_ChanServ, 3, av); delete [] av[2]; delete [] av[1]; delete [] av[0]; } - notice_lang(s_ChanServ, u, CHAN_CLEARED_USERS, chan); + notice_lang(Config.s_ChanServ, u, CHAN_CLEARED_USERS, chan); } else { - syntax_error(s_ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX); + syntax_error(Config.s_ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_CLEAR); + notice_help(Config.s_ChanServ, u, CHAN_HELP_CLEAR); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX); + syntax_error(Config.s_ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX); } }; @@ -295,7 +295,7 @@ class CSClear : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_CLEAR); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_CLEAR); } }; diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index 0198ea220..1999ef02e 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -31,7 +31,7 @@ class CommandCSDrop : public Command if (readonly) { - notice_lang(s_ChanServ, u, CHAN_DROP_DISABLED); // XXX: READ_ONLY_MODE? + notice_lang(Config.s_ChanServ, u, CHAN_DROP_DISABLED); // XXX: READ_ONLY_MODE? return MOD_CONT; } @@ -39,19 +39,19 @@ class CommandCSDrop : public Command if ((ci->HasFlag(CI_FORBIDDEN)) && !u->nc->HasCommand("chanserv/drop")) { - notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; } if ((ci->HasFlag(CI_SUSPENDED)) && !u->nc->HasCommand("chanserv/drop")) { - notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; } if ((ci->HasFlag(CI_SECUREFOUNDER) ? !IsRealFounder(u, ci) : !IsFounder(u, ci)) && !u->nc->HasCommand("chanserv/drop")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -72,7 +72,7 @@ class CommandCSDrop : public Command } alog("%s: Channel %s dropped by %s!%s@%s (founder: %s)", - s_ChanServ, ci->name, u->nick, u->GetIdent().c_str(), + Config.s_ChanServ, ci->name, u->nick, u->GetIdent().c_str(), u->host, (ci->founder ? ci->founder->display : "(none)")); delete ci; @@ -80,12 +80,12 @@ class CommandCSDrop : public Command /* We must make sure that the Services admin has not normally the right to * drop the channel before issuing the wallops. */ - if (WallDrop) { + if (Config.WallDrop) { if ((level < ACCESS_FOUNDER) || (!IsRealFounder(u, ci) && ci->HasFlag(CI_SECUREFOUNDER))) - ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used DROP on channel \2%s\2", u->nick, chan); + ircdproto->SendGlobops(Config.s_ChanServ, "\2%s\2 used DROP on channel \2%s\2", u->nick, chan); } - notice_lang(s_ChanServ, u, CHAN_DROPPED, chan); + notice_lang(Config.s_ChanServ, u, CHAN_DROPPED, chan); FOREACH_MOD(I_OnChanDrop, OnChanDrop(chan)); @@ -95,16 +95,16 @@ class CommandCSDrop : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (u->nc && u->nc->IsServicesOper()) - notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_DROP); + notice_help(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP_DROP); else - notice_help(s_ChanServ, u, CHAN_HELP_DROP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_DROP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "DROP", CHAN_DROP_SYNTAX); + syntax_error(Config.s_ChanServ, u, "DROP", CHAN_DROP_SYNTAX); } }; @@ -122,7 +122,7 @@ class CSDrop : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DROP); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DROP); } }; diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c index c0b4df8c5..61b045cd9 100644 --- a/src/core/cs_forbid.c +++ b/src/core/cs_forbid.c @@ -31,21 +31,21 @@ class CommandCSForbid : public Command Channel *c; - if (ForceForbidReason && !reason) + if (Config.ForceForbidReason && !reason) { - syntax_error(s_ChanServ, u, "FORBID", CHAN_FORBID_SYNTAX_REASON); + syntax_error(Config.s_ChanServ, u, "FORBID", CHAN_FORBID_SYNTAX_REASON); return MOD_CONT; } if (*chan != '#') { - notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED); + notice_lang(Config.s_ChanServ, u, CHAN_SYMBOL_REQUIRED); return MOD_CONT; } if (readonly) { - notice_lang(s_ChanServ, u, READ_ONLY_MODE); + notice_lang(Config.s_ChanServ, u, READ_ONLY_MODE); return MOD_CONT; } @@ -55,8 +55,8 @@ class CommandCSForbid : public Command ci = new ChannelInfo(chan); if (!ci) { - alog("%s: Valid FORBID for %s by %s failed", s_ChanServ, ci->name, u->nick); - notice_lang(s_ChanServ, u, CHAN_FORBID_FAILED, chan); + alog("%s: Valid FORBID for %s by %s failed", Config.s_ChanServ, ci->name, u->nick); + notice_lang(Config.s_ChanServ, u, CHAN_FORBID_FAILED, chan); return MOD_CONT; } @@ -85,21 +85,21 @@ class CommandCSForbid : public Command av[0] = c->name; av[1] = cu->user->nick; av[2] = reason ? reason : getstring(cu->user->nc, CHAN_FORBID_REASON); - ircdproto->SendKick(findbot(s_ChanServ), av[0], av[1], av[2]); - do_kick(s_ChanServ, 3, av); + ircdproto->SendKick(findbot(Config.s_ChanServ), av[0], av[1], av[2]); + do_kick(Config.s_ChanServ, 3, av); } } - if (WallForbid) - ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used FORBID on channel \2%s\2", u->nick, ci->name); + if (Config.WallForbid) + ircdproto->SendGlobops(Config.s_ChanServ, "\2%s\2 used FORBID on channel \2%s\2", u->nick, ci->name); if (ircd->chansqline) { ircdproto->SendSQLine(ci->name, ((reason) ? reason : "Forbidden")); } - alog("%s: %s set FORBID for channel %s", s_ChanServ, u->nick, ci->name); - notice_lang(s_ChanServ, u, CHAN_FORBID_SUCCEEDED, chan); + alog("%s: %s set FORBID for channel %s", Config.s_ChanServ, u->nick, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_FORBID_SUCCEEDED, chan); FOREACH_MOD(I_OnChanForbidden, OnChanForbidden(ci)); @@ -108,13 +108,13 @@ class CommandCSForbid : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_FORBID); + notice_help(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP_FORBID); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "FORBID", CHAN_FORBID_SYNTAX); + syntax_error(Config.s_ChanServ, u, "FORBID", CHAN_FORBID_SYNTAX); } }; @@ -132,7 +132,7 @@ class CSForbid : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_FORBID); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_FORBID); } }; diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c index b24dd4fcb..6992d97db 100644 --- a/src/core/cs_getkey.c +++ b/src/core/cs_getkey.c @@ -32,29 +32,29 @@ class CommandCSGetKey : public Command if (!check_access(u, ci, CA_GETKEY) && !u->nc->HasCommand("chanserv/getkey")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } if (!ci->c || !ci->c->GetParam(CMODE_KEY, &key)) { - notice_lang(s_ChanServ, u, CHAN_GETKEY_NOKEY, chan); + notice_lang(Config.s_ChanServ, u, CHAN_GETKEY_NOKEY, chan); return MOD_CONT; } - notice_lang(s_ChanServ, u, CHAN_GETKEY_KEY, chan, key.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_GETKEY_KEY, chan, key.c_str()); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_GETKEY); + notice_help(Config.s_ChanServ, u, CHAN_HELP_GETKEY); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "GETKEY", CHAN_GETKEY_SYNTAX); + syntax_error(Config.s_ChanServ, u, "GETKEY", CHAN_GETKEY_SYNTAX); } }; @@ -73,7 +73,7 @@ class CSGetKey : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETKEY); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_GETKEY); } }; diff --git a/src/core/cs_help.c b/src/core/cs_help.c index c18f6215b..f4df59d64 100644 --- a/src/core/cs_help.c +++ b/src/core/cs_help.c @@ -31,7 +31,7 @@ class CommandCSHelp : public Command if (cmd == "LEVELS DESC") { int i; - notice_help(s_ChanServ, u, CHAN_HELP_LEVELS_DESC); + notice_help(Config.s_ChanServ, u, CHAN_HELP_LEVELS_DESC); if (!levelinfo_maxwidth) { for (i = 0; levelinfo[i].what >= 0; i++) @@ -43,23 +43,23 @@ class CommandCSHelp : public Command } for (i = 0; levelinfo[i].what >= 0; i++) { - notice_help(s_ChanServ, u, CHAN_HELP_LEVELS_DESC_FORMAT, levelinfo_maxwidth, levelinfo[i].name, getstring(u, levelinfo[i].desc)); + notice_help(Config.s_ChanServ, u, CHAN_HELP_LEVELS_DESC_FORMAT, levelinfo_maxwidth, levelinfo[i].name, getstring(u, levelinfo[i].desc)); } } else - mod_help_cmd(s_ChanServ, u, CHANSERV, cmd.c_str()); + mod_help_cmd(Config.s_ChanServ, u, CHANSERV, cmd.c_str()); return MOD_CONT; } void OnSyntaxError(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP); + notice_help(Config.s_ChanServ, u, CHAN_HELP); FOREACH_MOD(I_OnChanServHelp, OnChanServHelp(u)); - if (CSExpire >= 86400) - notice_help(s_ChanServ, u, CHAN_HELP_EXPIRES, CSExpire / 86400); + if (Config.CSExpire >= 86400) + notice_help(Config.s_ChanServ, u, CHAN_HELP_EXPIRES, Config.CSExpire / 86400); if (u->nc && u->nc->IsServicesOper()) - notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP); + notice_help(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP); } }; diff --git a/src/core/cs_info.c b/src/core/cs_info.c index 1aed40e0a..3a74f0e06 100644 --- a/src/core/cs_info.c +++ b/src/core/cs_info.c @@ -54,12 +54,12 @@ class CommandCSInfo : public Command if (ci->HasFlag(CI_FORBIDDEN)) { if (is_oper(u) && ci->forbidby) - notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN_OPER, chan, + notice_lang(Config.s_ChanServ, u, CHAN_X_FORBIDDEN_OPER, chan, ci->forbidby, (ci->forbidreason ? ci-> forbidreason : getstring(u, NO_REASON))); else - notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; } @@ -68,19 +68,19 @@ class CommandCSInfo : public Command if (!param.empty() && param == "ALL" && (check_access(u, ci, CA_INFO) || has_auspex)) show_all = 1; - notice_lang(s_ChanServ, u, CHAN_INFO_HEADER, chan); - notice_lang(s_ChanServ, u, CHAN_INFO_NO_FOUNDER, ci->founder->display); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_HEADER, chan); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_NO_FOUNDER, ci->founder->display); if (show_all && ci->successor) - notice_lang(s_ChanServ, u, CHAN_INFO_NO_SUCCESSOR, ci->successor->display); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_NO_SUCCESSOR, ci->successor->display); - notice_lang(s_ChanServ, u, CHAN_INFO_DESCRIPTION, ci->desc); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_DESCRIPTION, ci->desc); tm = localtime(&ci->time_registered); strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_ChanServ, u, CHAN_INFO_TIME_REGGED, buf); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_TIME_REGGED, buf); tm = localtime(&ci->last_used); strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_ChanServ, u, CHAN_INFO_LAST_USED, buf); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_LAST_USED, buf); cm = ModeManager::FindChannelModeByName(CMODE_SECRET); // XXX: yuck. @@ -88,20 +88,20 @@ class CommandCSInfo : public Command (show_all || (!ci->HasMLock(cm->Name, true)) && (!ci->c || !(ci->c->HasMode(CMODE_SECRET))))) { - notice_lang(s_ChanServ, u, CHAN_INFO_LAST_TOPIC, ci->last_topic); - notice_lang(s_ChanServ, u, CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_LAST_TOPIC, ci->last_topic); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter); } if (ci->entry_message && show_all) - notice_lang(s_ChanServ, u, CHAN_INFO_ENTRYMSG, ci->entry_message); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_ENTRYMSG, ci->entry_message); if (ci->url) - notice_lang(s_ChanServ, u, CHAN_INFO_URL, ci->url); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_URL, ci->url); if (ci->email) - notice_lang(s_ChanServ, u, CHAN_INFO_EMAIL, ci->email); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_EMAIL, ci->email); if (show_all) { - notice_lang(s_ChanServ, u, CHAN_INFO_BANTYPE, ci->bantype); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_BANTYPE, ci->bantype); std::string optbuf; CheckOptStr(optbuf, CI_KEEPTOPIC, getstring(u, CHAN_INFO_OPT_KEEPTOPIC), ci, u->nc); @@ -120,47 +120,47 @@ class CommandCSInfo : public Command CheckOptStr(optbuf, CI_XOP, getstring(u, CHAN_INFO_OPT_XOP), ci, u->nc); CheckOptStr(optbuf, CI_PERSIST, getstring(u, CHAN_INFO_OPT_PERSIST), ci, u->nc); - notice_lang(s_ChanServ, u, CHAN_INFO_OPTIONS, optbuf.empty() ? getstring(u, CHAN_INFO_OPT_NONE) : optbuf.c_str()); - notice_lang(s_ChanServ, u, CHAN_INFO_MODE_LOCK, get_mlock_modes(ci, 1)); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_OPTIONS, optbuf.empty() ? getstring(u, CHAN_INFO_OPT_NONE) : optbuf.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_MODE_LOCK, get_mlock_modes(ci, 1)); // XXX: we could just as easily (and tidily) merge this in with the flags display above. if (ci->HasFlag(CI_NO_EXPIRE)) { - notice_lang(s_ChanServ, u, CHAN_INFO_NO_EXPIRE); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_NO_EXPIRE); } else { if (has_auspex) { - expt = ci->last_used + CSExpire; + expt = ci->last_used + Config.CSExpire; tm = localtime(&expt); strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_ChanServ, u, CHAN_INFO_EXPIRE, buf); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_EXPIRE, buf); } } } if (ci->HasFlag(CI_SUSPENDED)) { - notice_lang(s_ChanServ, u, CHAN_X_SUSPENDED, ci->forbidby, (ci->forbidreason ? ci->forbidreason : getstring(u, NO_REASON))); + notice_lang(Config.s_ChanServ, u, CHAN_X_SUSPENDED, ci->forbidby, (ci->forbidreason ? ci->forbidreason : getstring(u, NO_REASON))); } if (!show_all && (check_access(u, ci, CA_INFO) || has_auspex)) - notice_lang(s_ChanServ, u, NICK_INFO_FOR_MORE, s_ChanServ, ci->name); + notice_lang(Config.s_ChanServ, u, NICK_INFO_FOR_MORE, Config.s_ChanServ, ci->name); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_lang(s_ChanServ, u, CHAN_HELP_INFO); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_INFO); if (u->nc && u->nc->IsServicesOper()) - notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_INFO); + notice_lang(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP_INFO); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "INFO", CHAN_INFO_SYNTAX); + syntax_error(Config.s_ChanServ, u, "INFO", CHAN_INFO_SYNTAX); } }; @@ -178,7 +178,7 @@ class CSInfo : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INFO); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_INFO); } }; diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c index c8b0dde50..42278bb14 100644 --- a/src/core/cs_invite.c +++ b/src/core/cs_invite.c @@ -31,7 +31,7 @@ class CommandCSInvite : public Command if (!(c = findchan(chan))) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); return MOD_CONT; } @@ -39,7 +39,7 @@ class CommandCSInvite : public Command if (!u || !check_access(u, ci, CA_INVITE)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -49,30 +49,30 @@ class CommandCSInvite : public Command { if (!(u2 = finduser(params[1].c_str()))) { - notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, params[1].c_str()); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, params[1].c_str()); return MOD_CONT; } } if (is_on_chan(c, u2)) - notice_lang(s_ChanServ, u, CHAN_INVITE_ALREADY_IN, c->name); + notice_lang(Config.s_ChanServ, u, CHAN_INVITE_ALREADY_IN, c->name); else { ircdproto->SendInvite(whosends(ci), chan, u2->nick); - notice_lang(s_ChanServ, u, CHAN_INVITE_SUCCESS, c->name); + notice_lang(Config.s_ChanServ, u, CHAN_INVITE_SUCCESS, c->name); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_INVITE); + notice_help(Config.s_ChanServ, u, CHAN_HELP_INVITE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "INVITE", CHAN_INVITE_SYNTAX); + syntax_error(Config.s_ChanServ, u, "INVITE", CHAN_INVITE_SYNTAX); } }; @@ -90,7 +90,7 @@ class CSInvite : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INVITE); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_INVITE); } }; diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c index 17c35ab6c..eadab2853 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -49,19 +49,19 @@ class CommandCSKick : public Command ci = c->ci; if (!c) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); } else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) { - notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, target); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, target); } else if (!is_on_chan(c, u2)) { - notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name); } else if (!is_same ? !check_access(u, ci, CA_KICK) : !check_access(u, ci, CA_KICKME)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else if (!is_same && (ci->HasFlag(CI_PEACE)) && (get_access(u2, ci) >= get_access(u, ci))) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else if (is_protected(u2)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else { const char *av[3]; @@ -75,20 +75,20 @@ class CommandCSKick : public Command av[0] = ci->name; av[1] = target; av[2] = reason; - do_kick(s_ChanServ, 3, av); + do_kick(Config.s_ChanServ, 3, av); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_KICK); + notice_help(Config.s_ChanServ, u, CHAN_HELP_KICK); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "KICK", CHAN_KICK_SYNTAX); + syntax_error(Config.s_ChanServ, u, "KICK", CHAN_KICK_SYNTAX); } }; @@ -106,7 +106,7 @@ class CSKick : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_KICK); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_KICK); } }; diff --git a/src/core/cs_list.c b/src/core/cs_list.c index 93ffeffa5..7b83d6d9a 100644 --- a/src/core/cs_list.c +++ b/src/core/cs_list.c @@ -38,9 +38,9 @@ public: char *s = NULL; bool forbidden = false, suspended = false, channoexpire = false; - if (!(!CSListOpersOnly || (is_oper(u)))) + if (Config.CSListOpersOnly && !is_oper(u)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_STOP; } @@ -49,8 +49,8 @@ public: tmp = myStrGetOnlyToken((pattern + 1), '-', 0); /* Read FROM out */ if (!tmp) { - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); - notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, CS_LIST_INCORRECT_RANGE); return MOD_CONT; } for (s = tmp; *s; s++) @@ -58,8 +58,8 @@ public: if (!isdigit(*s)) { delete [] tmp; - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); - notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, CS_LIST_INCORRECT_RANGE); return MOD_CONT; } } @@ -68,8 +68,8 @@ public: tmp = myStrGetTokenRemainder(pattern, '-', 1); /* Read TO out */ if (!tmp) { - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); - notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, CS_LIST_INCORRECT_RANGE); return MOD_CONT; } for (s = tmp; *s; s++) @@ -77,8 +77,8 @@ public: if (!isdigit(*s)) { delete [] tmp; - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); - notice_lang(s_ChanServ, u, CS_LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, CS_LIST_INCORRECT_RANGE); return MOD_CONT; } } @@ -111,7 +111,7 @@ public: spattern = new char[spattern_size]; snprintf(spattern, spattern_size, "#%s", pattern); - notice_lang(s_ChanServ, u, CHAN_LIST_HEADER, pattern); + notice_lang(Config.s_ChanServ, u, CHAN_LIST_HEADER, pattern); for (i = 0; i < 256; i++) { for (ci = chanlists[i]; ci; ci = ci->next) @@ -133,7 +133,7 @@ public: { if ((((count + 1 >= from) && (count + 1 <= to)) || ((from == 0) && (to == 0))) - && (++nchans <= CSListMax)) + && (++nchans <= Config.CSListMax)) { char noexpire_char = ' '; if (is_servadmin && (ci->HasFlag(CI_NO_EXPIRE))) @@ -155,14 +155,14 @@ public: ci->name, ci->desc ? ci->desc : ""); } - u->SendMessage(s_ChanServ, " %c%s", noexpire_char, buf); + u->SendMessage(Config.s_ChanServ, " %c%s", noexpire_char, buf); } count++; } } } - notice_lang(s_ChanServ, u, CHAN_LIST_END, - nchans > CSListMax ? CSListMax : nchans, nchans); + notice_lang(Config.s_ChanServ, u, CHAN_LIST_END, + nchans > Config.CSListMax ? Config.CSListMax : nchans, nchans); delete [] spattern; if (tofree) delete [] pattern; @@ -171,13 +171,13 @@ public: bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_LIST); + notice_help(Config.s_ChanServ, u, CHAN_HELP_LIST); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "LIST", CHAN_LIST_SYNTAX); + syntax_error(Config.s_ChanServ, u, "LIST", CHAN_LIST_SYNTAX); } }; @@ -195,7 +195,7 @@ public: } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LIST); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_LIST); } }; diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index 49613e071..f1ad758d0 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -45,17 +45,17 @@ static CommandReturn do_util(User *u, ChannelMode *cm, const char *chan, const c ci = c->ci; if (!c) - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); else if (is_same ? !(u2 = u) : !(u2 = finduser(nick))) - notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, nick); else if (!is_on_chan(c, u2)) - notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name); else if (is_same ? !check_access(u, ci, levelself) : !check_access(u, ci, level)) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (!set && !is_same && (ci->HasFlag(CI_PEACE)) && (get_access(u2, ci) >= get_access(u, ci))) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (!set && is_protected(u2) && !is_same) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else { snprintf(modebuf, sizeof(modebuf), "%c%c", (set ? '+' : '-'), cm->ModeChar); @@ -65,7 +65,7 @@ static CommandReturn do_util(User *u, ChannelMode *cm, const char *chan, const c av[0] = modebuf; av[1] = u2->nick; - chan_set_modes(s_ChanServ, c, 2, av, 3); + chan_set_modes(Config.s_ChanServ, c, 2, av, 3); if (notice && ci->HasFlag(notice)) ircdproto->SendMessage(whosends(ci), c->name, "%s command used for %s by %s", @@ -91,13 +91,13 @@ class CommandCSOp : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_OP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_OP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "OP", CHAN_OP_SYNTAX); + syntax_error(Config.s_ChanServ, u, "OP", CHAN_OP_SYNTAX); } }; @@ -118,13 +118,13 @@ class CommandCSDeOp : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_DEOP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_DEOP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "DEOP", CHAN_DEOP_SYNTAX); + syntax_error(Config.s_ChanServ, u, "DEOP", CHAN_DEOP_SYNTAX); } }; @@ -145,13 +145,13 @@ class CommandCSVoice : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_VOICE); + notice_help(Config.s_ChanServ, u, CHAN_HELP_VOICE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "VOICE", CHAN_VOICE_SYNTAX); + syntax_error(Config.s_ChanServ, u, "VOICE", CHAN_VOICE_SYNTAX); } }; @@ -172,13 +172,13 @@ class CommandCSDeVoice : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_DEVOICE); + notice_help(Config.s_ChanServ, u, CHAN_HELP_DEVOICE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "DEVOICE", CHAN_DEVOICE_SYNTAX); + syntax_error(Config.s_ChanServ, u, "DEVOICE", CHAN_DEVOICE_SYNTAX); } }; @@ -204,13 +204,13 @@ class CommandCSHalfOp : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_HALFOP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_HALFOP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "HALFOP", CHAN_HALFOP_SYNTAX); + syntax_error(Config.s_ChanServ, u, "HALFOP", CHAN_HALFOP_SYNTAX); } }; @@ -237,13 +237,13 @@ class CommandCSDeHalfOp : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_DEHALFOP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_DEHALFOP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "DEHALFOP", CHAN_DEHALFOP_SYNTAX); + syntax_error(Config.s_ChanServ, u, "DEHALFOP", CHAN_DEHALFOP_SYNTAX); } }; @@ -269,13 +269,13 @@ class CommandCSProtect : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_PROTECT); + notice_help(Config.s_ChanServ, u, CHAN_HELP_PROTECT); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "PROTECT", CHAN_PROTECT_SYNTAX); + syntax_error(Config.s_ChanServ, u, "PROTECT", CHAN_PROTECT_SYNTAX); } }; @@ -300,13 +300,13 @@ class CommandCSDeProtect : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_DEPROTECT); + notice_help(Config.s_ChanServ, u, CHAN_HELP_DEPROTECT); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "DEPROTECT", CHAN_DEPROTECT_SYNTAX); + syntax_error(Config.s_ChanServ, u, "DEPROTECT", CHAN_DEPROTECT_SYNTAX); } }; @@ -331,13 +331,13 @@ class CommandCSOwner : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_OWNER); + notice_help(Config.s_ChanServ, u, CHAN_HELP_OWNER); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "OWNER", CHAN_OWNER_SYNTAX); + syntax_error(Config.s_ChanServ, u, "OWNER", CHAN_OWNER_SYNTAX); } }; @@ -362,13 +362,13 @@ class CommandCSDeOwner : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_DEOWNER); + notice_help(Config.s_ChanServ, u, CHAN_HELP_DEOWNER); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "DEOWNER", CHAN_DEOWNER_SYNTAX); + syntax_error(Config.s_ChanServ, u, "DEOWNER", CHAN_DEOWNER_SYNTAX); } }; @@ -411,27 +411,27 @@ class CSModes : public Module { if (ModeManager::FindChannelModeByName(CMODE_OWNER)) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OWNER); - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEOWNER); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_OWNER); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DEOWNER); } if (ModeManager::FindChannelModeByName(CMODE_PROTECT)) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_PROTECT); - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEPROTECT); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_PROTECT); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DEPROTECT); } - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OP); - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEOP); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_OP); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DEOP); if (ModeManager::FindChannelModeByName(CMODE_HALFOP)) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HALFOP); - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEHALFOP); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_HALFOP); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DEHALFOP); } - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_VOICE); - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEVOICE); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_VOICE); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DEVOICE); } }; diff --git a/src/core/cs_register.c b/src/core/cs_register.c index 789949690..6a258a684 100644 --- a/src/core/cs_register.c +++ b/src/core/cs_register.c @@ -33,30 +33,30 @@ class CommandCSRegister : public Command if (readonly) { - notice_lang(s_ChanServ, u, CHAN_REGISTER_DISABLED); + notice_lang(Config.s_ChanServ, u, CHAN_REGISTER_DISABLED); return MOD_CONT; } if (*chan == '&') - notice_lang(s_ChanServ, u, CHAN_REGISTER_NOT_LOCAL); + notice_lang(Config.s_ChanServ, u, CHAN_REGISTER_NOT_LOCAL); else if (*chan != '#') - notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED); + notice_lang(Config.s_ChanServ, u, CHAN_SYMBOL_REQUIRED); else if (!ircdproto->IsChannelValid(chan)) - notice_lang(s_ChanServ, u, CHAN_X_INVALID, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_INVALID, chan); else if (!(c = findchan(chan))) - notice_lang(s_ChanServ, u, CHAN_REGISTER_NONE_CHANNEL, chan); + notice_lang(Config.s_ChanServ, u, CHAN_REGISTER_NONE_CHANNEL, chan); else if ((ci = cs_findchan(chan))) - notice_lang(s_ChanServ, u, CHAN_ALREADY_REGISTERED, chan); + notice_lang(Config.s_ChanServ, u, CHAN_ALREADY_REGISTERED, chan); else if (!stricmp(chan, "#")) - notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan); + notice_lang(Config.s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan); else if (!chan_has_user_status(c, u, CUS_OP)) - notice_lang(s_ChanServ, u, CHAN_MUST_BE_CHANOP); - else if (CSMaxReg && u->nc->channelcount >= CSMaxReg && !u->nc->HasPriv("chanserv/no-register-limit")) - notice_lang(s_ChanServ, u, u->nc->channelcount > CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, CSMaxReg); + notice_lang(Config.s_ChanServ, u, CHAN_MUST_BE_CHANOP); + else if (Config.CSMaxReg && u->nc->channelcount >= Config.CSMaxReg && !u->nc->HasPriv("chanserv/no-register-limit")) + notice_lang(Config.s_ChanServ, u, u->nc->channelcount > Config.CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, Config.CSMaxReg); else if (!(ci = new ChannelInfo(chan))) { - alog("%s: makechan() failed for REGISTER %s", s_ChanServ, chan); - notice_lang(s_ChanServ, u, CHAN_REGISTRATION_FAILED); + alog("%s: makechan() failed for REGISTER %s", Config.s_ChanServ, chan); + notice_lang(Config.s_ChanServ, u, CHAN_REGISTRATION_FAILED); } else { @@ -71,20 +71,20 @@ class CommandCSRegister : public Command strscpy(ci->last_topic_setter, c->topic_setter, NICKMAX); ci->last_topic_time = c->topic_time; } - else strscpy(ci->last_topic_setter, s_ChanServ, NICKMAX); /* Set this to something, otherwise it will maliform the topic */ + else strscpy(ci->last_topic_setter, Config.s_ChanServ, NICKMAX); /* Set this to something, otherwise it will maliform the topic */ ci->bi = NULL; ++ci->founder->channelcount; - alog("%s: Channel '%s' registered by %s!%s@%s", s_ChanServ, chan, u->nick, u->GetIdent().c_str(), u->host); - notice_lang(s_ChanServ, u, CHAN_REGISTERED, chan, u->nick); + alog("%s: Channel '%s' registered by %s!%s@%s", Config.s_ChanServ, chan, u->nick, u->GetIdent().c_str(), u->host); + notice_lang(Config.s_ChanServ, u, CHAN_REGISTERED, chan, u->nick); /* Implement new mode lock */ check_modes(c); /* On most ircds you do not receive the admin/owner mode till its registered */ if ((cm = ModeManager::FindChannelModeByName(CMODE_OWNER))) - ircdproto->SendMode(findbot(s_ChanServ), chan, "+%c %s", cm->ModeChar, u->nick); + ircdproto->SendMode(findbot(Config.s_ChanServ), chan, "+%c %s", cm->ModeChar, u->nick); else if ((cm = ModeManager::FindChannelModeByName(CMODE_PROTECT))) - ircdproto->SendMode(findbot(s_ChanServ), chan, "+%c %s", cm->ModeChar, u->nick); + ircdproto->SendMode(findbot(Config.s_ChanServ), chan, "+%c %s", cm->ModeChar, u->nick); /* Mark the channel as persistant */ if (c->HasMode(CMODE_PERM)) @@ -103,13 +103,13 @@ class CommandCSRegister : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_REGISTER, s_ChanServ); + notice_help(Config.s_ChanServ, u, CHAN_HELP_REGISTER, Config.s_ChanServ); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "REGISTER", CHAN_REGISTER_SYNTAX); + syntax_error(Config.s_ChanServ, u, "REGISTER", CHAN_REGISTER_SYNTAX); } }; @@ -128,7 +128,7 @@ class CSRegister : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_REGISTER); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_REGISTER); } }; diff --git a/src/core/cs_set.c b/src/core/cs_set.c index 271cb92ae..c7cb6bc2b 100644 --- a/src/core/cs_set.c +++ b/src/core/cs_set.c @@ -26,24 +26,24 @@ class CommandCSSet : public Command if (!na) { - notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, param.c_str()); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_REGISTERED, param.c_str()); return MOD_CONT; } else if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, param.c_str()); + notice_lang(Config.s_ChanServ, u, NICK_X_FORBIDDEN, param.c_str()); return MOD_CONT; } nc = na->nc; - if (CSMaxReg && nc->channelcount >= CSMaxReg && !u->nc->HasPriv("chanserv/no-register-limit")) + if (Config.CSMaxReg && nc->channelcount >= Config.CSMaxReg && !u->nc->HasPriv("chanserv/no-register-limit")) { - notice_lang(s_ChanServ, u, CHAN_SET_FOUNDER_TOO_MANY_CHANS, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_SET_FOUNDER_TOO_MANY_CHANS, param.c_str()); return MOD_CONT; } alog("%s: Changing founder of %s from %s to %s by %s!%s@%s", - s_ChanServ, ci->name, ci->founder->display, nc->display, u->nick, + Config.s_ChanServ, ci->name, ci->founder->display, nc->display, u->nick, u->GetIdent().c_str(), u->host); /* Founder and successor must not be the same group */ @@ -54,7 +54,7 @@ class CommandCSSet : public Command ci->founder = nc; nc->channelcount++; - notice_lang(s_ChanServ, u, CHAN_FOUNDER_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_FOUNDER_CHANGED, ci->name, param.c_str()); return MOD_CONT; } @@ -69,17 +69,17 @@ class CommandCSSet : public Command if (!na) { - notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, param.c_str()); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_REGISTERED, param.c_str()); return MOD_CONT; } if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, param.c_str()); + notice_lang(Config.s_ChanServ, u, NICK_X_FORBIDDEN, param.c_str()); return MOD_CONT; } if (na->nc == ci->founder) { - notice_lang(s_ChanServ, u, CHAN_SUCCESSOR_IS_FOUNDER, param.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SUCCESSOR_IS_FOUNDER, param.c_str(), ci->name); return MOD_CONT; } nc = na->nc; @@ -89,16 +89,16 @@ class CommandCSSet : public Command nc = NULL; alog("%s: Changing successor of %s from %s to %s by %s!%s@%s", - s_ChanServ, ci->name, + Config.s_ChanServ, ci->name, (ci->successor ? ci->successor->display : "none"), (nc ? nc->display : "none"), u->nick, u->GetIdent().c_str(), u->host); ci->successor = nc; if (nc) - notice_lang(s_ChanServ, u, CHAN_SUCCESSOR_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_SUCCESSOR_CHANGED, ci->name, param.c_str()); else - notice_lang(s_ChanServ, u, CHAN_SUCCESSOR_UNSET, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SUCCESSOR_UNSET, ci->name); return MOD_CONT; } @@ -108,7 +108,7 @@ class CommandCSSet : public Command if (ci->desc) delete [] ci->desc; ci->desc = sstrdup(param.c_str()); - notice_lang(s_ChanServ, u, CHAN_DESC_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_DESC_CHANGED, ci->name, param.c_str()); return MOD_CONT; } @@ -119,12 +119,12 @@ class CommandCSSet : public Command if (!param.empty()) { ci->url = sstrdup(param.c_str()); - notice_lang(s_ChanServ, u, CHAN_URL_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_URL_CHANGED, ci->name, param.c_str()); } else { ci->url = NULL; - notice_lang(s_ChanServ, u, CHAN_URL_UNSET, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_URL_UNSET, ci->name); } return MOD_CONT; } @@ -136,12 +136,12 @@ class CommandCSSet : public Command if (!param.empty()) { ci->email = sstrdup(param.c_str()); - notice_lang(s_ChanServ, u, CHAN_EMAIL_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_EMAIL_CHANGED, ci->name, param.c_str()); } else { ci->email = NULL; - notice_lang(s_ChanServ, u, CHAN_EMAIL_UNSET, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_EMAIL_UNSET, ci->name); } return MOD_CONT; } @@ -153,12 +153,12 @@ class CommandCSSet : public Command if (!param.empty()) { ci->entry_message = sstrdup(param.c_str()); - notice_lang(s_ChanServ, u, CHAN_ENTRY_MSG_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_ENTRY_MSG_CHANGED, ci->name, param.c_str()); } else { ci->entry_message = NULL; - notice_lang(s_ChanServ, u, CHAN_ENTRY_MSG_UNSET, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ENTRY_MSG_UNSET, ci->name); } return MOD_CONT; } @@ -204,7 +204,7 @@ class CommandCSSet : public Command { if (!cm->CanSet(u)) { - notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_IMPOSSIBLE_CHAR, mode); + notice_lang(Config.s_ChanServ, u, CHAN_SET_MLOCK_IMPOSSIBLE_CHAR, mode); } else if (add) { @@ -233,7 +233,7 @@ class CommandCSSet : public Command } } else - notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_UNKNOWN_CHAR, mode); + notice_lang(Config.s_ChanServ, u, CHAN_SET_MLOCK_UNKNOWN_CHAR, mode); } /* while (*modes) */ if (ModeManager::FindChannelModeByName(CMODE_REDIRECT)) { @@ -241,7 +241,7 @@ class CommandCSSet : public Command if (ci->HasMLock(CMODE_REDIRECT, true) && !ci->HasMLock(CMODE_LIMIT, true)) { ci->RemoveMLock(CMODE_REDIRECT); - notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_L_REQUIRED); + notice_lang(Config.s_ChanServ, u, CHAN_SET_MLOCK_L_REQUIRED); } } @@ -251,7 +251,7 @@ class CommandCSSet : public Command if (ci->HasMLock(CMODE_NOKNOCK, true) && !ci->HasMLock(CMODE_INVITE, true)) { ci->RemoveMLock(CMODE_NOKNOCK); - notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_K_REQUIRED); + notice_lang(Config.s_ChanServ, u, CHAN_SET_MLOCK_K_REQUIRED); } } @@ -259,7 +259,7 @@ class CommandCSSet : public Command * mode lock at all. */ if (get_mlock_modes(ci, 0)) { - notice_lang(s_ChanServ, u, CHAN_MLOCK_CHANGED, ci->name, + notice_lang(Config.s_ChanServ, u, CHAN_MLOCK_CHANGED, ci->name, get_mlock_modes(ci, 0)); } @@ -276,10 +276,10 @@ class CommandCSSet : public Command int16 bantype = strtol(param, &endptr, 10); if (*endptr != 0 || bantype < 0 || bantype > 3) { - notice_lang(s_ChanServ, u, CHAN_SET_BANTYPE_INVALID, param); + notice_lang(Config.s_ChanServ, u, CHAN_SET_BANTYPE_INVALID, param); } else { ci->bantype = bantype; - notice_lang(s_ChanServ, u, CHAN_SET_BANTYPE_CHANGED, ci->name, + notice_lang(Config.s_ChanServ, u, CHAN_SET_BANTYPE_CHANGED, ci->name, ci->bantype); } return MOD_CONT; @@ -290,12 +290,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_KEEPTOPIC); - notice_lang(s_ChanServ, u, CHAN_SET_KEEPTOPIC_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_KEEPTOPIC_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_KEEPTOPIC); - notice_lang(s_ChanServ, u, CHAN_SET_KEEPTOPIC_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_KEEPTOPIC_OFF, ci->name); } else this->OnSyntaxError(u, "KEEPTOPIC"); @@ -308,12 +308,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_TOPICLOCK); - notice_lang(s_ChanServ, u, CHAN_SET_TOPICLOCK_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_TOPICLOCK_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_TOPICLOCK); - notice_lang(s_ChanServ, u, CHAN_SET_TOPICLOCK_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_TOPICLOCK_OFF, ci->name); } else this->OnSyntaxError(u, "TOPICLOCK"); @@ -326,12 +326,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_PRIVATE); - notice_lang(s_ChanServ, u, CHAN_SET_PRIVATE_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PRIVATE_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_PRIVATE); - notice_lang(s_ChanServ, u, CHAN_SET_PRIVATE_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PRIVATE_OFF, ci->name); } else this->OnSyntaxError(u, "PRIVATE"); @@ -344,12 +344,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_SECUREOPS); - notice_lang(s_ChanServ, u, CHAN_SET_SECUREOPS_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREOPS_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_SECUREOPS); - notice_lang(s_ChanServ, u, CHAN_SET_SECUREOPS_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREOPS_OFF, ci->name); } else this->OnSyntaxError(u, "SECUREOPS"); @@ -362,12 +362,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_SECUREFOUNDER); - notice_lang(s_ChanServ, u, CHAN_SET_SECUREFOUNDER_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREFOUNDER_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_SECUREFOUNDER); - notice_lang(s_ChanServ, u, CHAN_SET_SECUREFOUNDER_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREFOUNDER_OFF, ci->name); } else this->OnSyntaxError(u, "SECUREFOUNDER"); @@ -382,14 +382,14 @@ class CommandCSSet : public Command ci->SetFlag(CI_RESTRICTED); if (ci->levels[CA_NOJOIN] < 0) ci->levels[CA_NOJOIN] = 0; - notice_lang(s_ChanServ, u, CHAN_SET_RESTRICTED_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_RESTRICTED_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_RESTRICTED); if (ci->levels[CA_NOJOIN] >= 0) ci->levels[CA_NOJOIN] = -2; - notice_lang(s_ChanServ, u, CHAN_SET_RESTRICTED_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_RESTRICTED_OFF, ci->name); } else this->OnSyntaxError(u, "RESTRICTED"); @@ -402,12 +402,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_SECURE); - notice_lang(s_ChanServ, u, CHAN_SET_SECURE_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECURE_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_SECURE); - notice_lang(s_ChanServ, u, CHAN_SET_SECURE_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECURE_OFF, ci->name); } else this->OnSyntaxError(u, "SECURE"); @@ -421,19 +421,19 @@ class CommandCSSet : public Command { ci->SetFlag(CI_SIGNKICK); ci->UnsetFlag(CI_SIGNKICK_LEVEL); - notice_lang(s_ChanServ, u, CHAN_SET_SIGNKICK_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SIGNKICK_ON, ci->name); } else if (param == "LEVEL") { ci->SetFlag(CI_SIGNKICK_LEVEL); ci->UnsetFlag(CI_SIGNKICK); - notice_lang(s_ChanServ, u, CHAN_SET_SIGNKICK_LEVEL, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SIGNKICK_LEVEL, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_SIGNKICK); ci->UnsetFlag(CI_SIGNKICK_LEVEL); - notice_lang(s_ChanServ, u, CHAN_SET_SIGNKICK_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SIGNKICK_OFF, ci->name); } else this->OnSyntaxError(u, "SIGNKICK"); @@ -446,12 +446,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_OPNOTICE); - notice_lang(s_ChanServ, u, CHAN_SET_OPNOTICE_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_OPNOTICE_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_OPNOTICE); - notice_lang(s_ChanServ, u, CHAN_SET_OPNOTICE_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_OPNOTICE_OFF, ci->name); } else this->OnSyntaxError(u, "OPNOTICE"); @@ -500,17 +500,17 @@ class CommandCSSet : public Command ci->SetFlag(CI_XOP); } - alog("%s: %s!%s@%s enabled XOP for %s", s_ChanServ, u->nick, + alog("%s: %s!%s@%s enabled XOP for %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ci->name); - notice_lang(s_ChanServ, u, CHAN_SET_XOP_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_XOP_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_XOP); - alog("%s: %s!%s@%s disabled XOP for %s", s_ChanServ, u->nick, + alog("%s: %s!%s@%s disabled XOP for %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ci->name); - notice_lang(s_ChanServ, u, CHAN_SET_XOP_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_XOP_OFF, ci->name); } else this->OnSyntaxError(u, "XOP"); @@ -525,12 +525,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_PEACE); - notice_lang(s_ChanServ, u, CHAN_SET_PEACE_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PEACE_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_PEACE); - notice_lang(s_ChanServ, u, CHAN_SET_PEACE_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PEACE_OFF, ci->name); } else this->OnSyntaxError(u, "PEACE"); @@ -560,9 +560,9 @@ class CommandCSSet : public Command if (!ci->bi && !cm) { /* Give them ChanServ - * Yes, this works fine with no s_BotServ + * Yes, this works fine with no Config.s_BotServ */ - findbot(s_ChanServ)->Assign(NULL, ci); + findbot(Config.s_ChanServ)->Assign(NULL, ci); } /* Set the perm mode */ @@ -573,7 +573,7 @@ class CommandCSSet : public Command } } - notice_lang(s_ChanServ, u, CHAN_SET_PERSIST_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PERSIST_ON, ci->name); } else if (param == "OFF") { @@ -590,7 +590,7 @@ class CommandCSSet : public Command /* Persist is set off... remove the bot and delete the channel if its empty */ else if (ci->c) { - if (s_BotServ && ci->bi && ci->c->usercount == BSMinUsers - 1) + if (Config.s_BotServ && ci->bi && ci->c->usercount == Config.BSMinUsers - 1) ircdproto->SendPart(ci->bi, ci->c->name, NULL); if (!ci->c->users) delete ci->c; @@ -598,15 +598,15 @@ class CommandCSSet : public Command /* No channel mode, no BotServ, but using ChanServ as the botserv bot * which was assigned when persist was set on */ - if (!cm && !s_BotServ && ci->bi) + if (!cm && !Config.s_BotServ && ci->bi) { /* Unassign bot */ - findbot(s_ChanServ)->UnAssign(NULL, ci); + findbot(Config.s_ChanServ)->UnAssign(NULL, ci); } } } - notice_lang(s_ChanServ, u, CHAN_SET_PERSIST_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PERSIST_OFF, ci->name); } else this->OnSyntaxError(u, "PERSIST"); @@ -618,18 +618,18 @@ class CommandCSSet : public Command { if (!u->nc->HasCommand("chanserv/set/noexpire")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } if (param == "ON") { ci->SetFlag(CI_NO_EXPIRE); - notice_lang(s_ChanServ, u, CHAN_SET_NOEXPIRE_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_NOEXPIRE_ON, ci->name); } else if (param == "OFF") { ci->UnsetFlag(CI_NO_EXPIRE); - notice_lang(s_ChanServ, u, CHAN_SET_NOEXPIRE_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_NOEXPIRE_OFF, ci->name); } else this->OnSyntaxError(u, "NOEXPIRE"); @@ -651,25 +651,25 @@ class CommandCSSet : public Command bool is_servadmin = u->nc->HasPriv("chanserv/set"); if (readonly) { - notice_lang(s_ChanServ, u, CHAN_SET_DISABLED); + notice_lang(Config.s_ChanServ, u, CHAN_SET_DISABLED); return MOD_CONT; } if (param.empty() && cmd != "SUCCESSOR" && cmd != "URL" && cmd != "EMAIL" && cmd != "ENTRYMSG" && cmd != "MLOCK") this->OnSyntaxError(u, cmd); else if (!is_servadmin && !check_access(u, ci, CA_SET)) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (cmd == "FOUNDER") { if (!is_servadmin && (ci->HasFlag(CI_SECUREFOUNDER) ? !IsRealFounder(u, ci) : !IsFounder(u, ci))) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else DoSetFounder(u, ci, param); } else if (cmd == "SUCCESSOR") { if (!is_servadmin && (ci->HasFlag(CI_SECUREFOUNDER) ? !IsRealFounder(u, ci) : !IsFounder(u, ci))) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else DoSetSuccessor(u, ci, param); } @@ -682,7 +682,7 @@ class CommandCSSet : public Command else if (cmd == "ENTRYMSG") DoSetEntryMsg(u, ci, param); else if (cmd == "TOPIC") - notice_lang(s_ChanServ, u, OBSOLETE_COMMAND, "TOPIC"); + notice_lang(Config.s_ChanServ, u, OBSOLETE_COMMAND, "TOPIC"); else if (cmd == "BANTYPE") DoSetBanType(u, ci, param.c_str()); else if (cmd == "MLOCK") @@ -698,7 +698,7 @@ class CommandCSSet : public Command else if (cmd == "SECUREFOUNDER") { if (!is_servadmin && (ci->HasFlag(CI_SECUREFOUNDER) ? !IsRealFounder(u, ci) : !IsFounder(u, ci))) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else DoSetSecureFounder(u, ci, param); } @@ -713,7 +713,7 @@ class CommandCSSet : public Command else if (cmd == "XOP") { if (!findModule("cs_xop")) - notice_lang(s_ChanServ, u, CHAN_XOP_NOT_AVAILABLE, cmd.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_XOP_NOT_AVAILABLE, cmd.c_str()); else DoSetXOP(u, ci, param); } @@ -725,8 +725,8 @@ class CommandCSSet : public Command DoSetNoExpire(u, ci, param); else { - notice_lang(s_ChanServ, u, CHAN_SET_UNKNOWN_OPTION, cmd.c_str()); - notice_lang(s_ChanServ, u, MORE_INFO, s_ChanServ, "SET"); + notice_lang(Config.s_ChanServ, u, CHAN_SET_UNKNOWN_OPTION, cmd.c_str()); + notice_lang(Config.s_ChanServ, u, MORE_INFO, Config.s_ChanServ, "SET"); } return MOD_CONT; @@ -736,52 +736,52 @@ class CommandCSSet : public Command { if (subcommand.empty()) { - notice_help(s_ChanServ, u, CHAN_HELP_SET); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET); if (u->nc && u->nc->IsServicesOper()) - notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET); + notice_help(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP_SET); } else if (subcommand == "FOUNDER") - notice_help(s_ChanServ, u, CHAN_HELP_SET_FOUNDER); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_FOUNDER); else if (subcommand == "SUCCESSOR") - notice_help(s_ChanServ, u, CHAN_HELP_SET_SUCCESSOR); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_SUCCESSOR); else if (subcommand == "DESC") - notice_help(s_ChanServ, u, CHAN_HELP_SET_DESC); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_DESC); else if (subcommand == "URL") - notice_help(s_ChanServ, u, CHAN_HELP_SET_URL); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_URL); else if (subcommand == "EMAIL") - notice_help(s_ChanServ, u, CHAN_HELP_SET_EMAIL); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_EMAIL); else if (subcommand == "ENTRYMSG") - notice_help(s_ChanServ, u, CHAN_HELP_SET_ENTRYMSG); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_ENTRYMSG); else if (subcommand == "BANTYPE") - notice_help(s_ChanServ, u, CHAN_HELP_SET_BANTYPE); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_BANTYPE); else if (subcommand == "PRIVATE") - notice_help(s_ChanServ, u, CHAN_HELP_SET_PRIVATE); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_PRIVATE); else if (subcommand == "KEEPTOPIC") - notice_help(s_ChanServ, u, CHAN_HELP_SET_KEEPTOPIC); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_KEEPTOPIC); else if (subcommand == "TOPICLOCK") - notice_help(s_ChanServ, u, CHAN_HELP_SET_TOPICLOCK); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_TOPICLOCK); else if (subcommand == "MLOCK") - notice_help(s_ChanServ, u, CHAN_HELP_SET_MLOCK); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_MLOCK); else if (subcommand == "RESTRICTED") - notice_help(s_ChanServ, u, CHAN_HELP_SET_RESTRICTED); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_RESTRICTED); else if (subcommand == "SECURE") - notice_help(s_ChanServ, u, CHAN_HELP_SET_SECURE, s_NickServ); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_SECURE, Config.s_NickServ); else if (subcommand == "SECUREOPS") - notice_help(s_ChanServ, u, CHAN_HELP_SET_SECUREOPS); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_SECUREOPS); else if (subcommand == "SECUREFOUNDER") - notice_help(s_ChanServ, u, CHAN_HELP_SET_SECUREFOUNDER); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_SECUREFOUNDER); else if (subcommand == "SIGNKICK") - notice_help(s_ChanServ, u, CHAN_HELP_SET_SIGNKICK); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_SIGNKICK); else if (subcommand == "OPNOTICE") - notice_help(s_ChanServ, u, CHAN_HELP_SET_OPNOTICE); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_OPNOTICE); else if (subcommand == "XOP") - notice_help(s_ChanServ, u, CHAN_HELP_SET_XOP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_XOP); else if (subcommand == "PEACE") - notice_help(s_ChanServ, u, CHAN_HELP_SET_PEACE); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_PEACE); else if (subcommand == "PERSIST") - notice_help(s_ChanServ, u, CHAN_HELP_SET_PERSIST); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_PERSIST); else if (subcommand == "NOEXPIRE") - notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET_NOEXPIRE); + notice_help(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP_SET_NOEXPIRE); else return false; @@ -826,7 +826,7 @@ class CommandCSSet : public Command command += " " + subcommand; } - syntax_error(s_ChanServ, u, command.c_str(), reply); + syntax_error(Config.s_ChanServ, u, command.c_str(), reply); } }; @@ -844,7 +844,7 @@ class CSSet : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SET); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_SET); } }; diff --git a/src/core/cs_status.c b/src/core/cs_status.c index 7ec6a820b..f975219c2 100644 --- a/src/core/cs_status.c +++ b/src/core/cs_status.c @@ -38,23 +38,23 @@ class CommandCSStatus : public Command ci = cs_findchan(chan); } if (!ci) - notice_lang(s_ChanServ, u, CHAN_STATUS_NOT_REGGED, temp); + notice_lang(Config.s_ChanServ, u, CHAN_STATUS_NOT_REGGED, temp); else if ((u2 = finduser(nick))) - notice_lang(s_ChanServ, u, CHAN_STATUS_INFO, chan, nick, get_access(u2, ci)); + notice_lang(Config.s_ChanServ, u, CHAN_STATUS_INFO, chan, nick, get_access(u2, ci)); else /* !u2 */ - notice_lang(s_ChanServ, u, CHAN_STATUS_NOTONLINE, nick); + notice_lang(Config.s_ChanServ, u, CHAN_STATUS_NOTONLINE, nick); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_STATUS); + notice_help(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP_STATUS); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "STATUS", CHAN_STATUS_SYNTAX); + syntax_error(Config.s_ChanServ, u, "STATUS", CHAN_STATUS_SYNTAX); } }; @@ -73,7 +73,7 @@ class CSStatus : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_STATUS); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_STATUS); } }; diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c index 189588736..ddad30930 100644 --- a/src/core/cs_suspend.c +++ b/src/core/cs_suspend.c @@ -31,7 +31,7 @@ class CommandCSSuspend : public Command Channel *c; /* Assumes that permission checking has already been done. */ - if (ForceForbidReason && !reason) + if (Config.ForceForbidReason && !reason) { this->OnSyntaxError(u, ""); return MOD_CONT; @@ -39,19 +39,19 @@ class CommandCSSuspend : public Command if (chan[0] != '#') { - notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_ERROR); + notice_lang(Config.s_ChanServ, u, CHAN_UNSUSPEND_ERROR); return MOD_CONT; } /* You should not SUSPEND a FORBIDEN channel */ if (ci->HasFlag(CI_FORBIDDEN)) { - notice_lang(s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan); + notice_lang(Config.s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan); return MOD_CONT; } if (readonly) - notice_lang(s_ChanServ, u, READ_ONLY_MODE); + notice_lang(Config.s_ChanServ, u, READ_ONLY_MODE); if (ci) { @@ -75,36 +75,36 @@ class CommandCSSuspend : public Command av[0] = c->name; av[1] = cu->user->nick; av[2] = reason ? reason : getstring(cu->user->nc, CHAN_SUSPEND_REASON); - ircdproto->SendKick(findbot(s_ChanServ), av[0], av[1], av[2]); - do_kick(s_ChanServ, 3, av); + ircdproto->SendKick(findbot(Config.s_ChanServ), av[0], av[1], av[2]); + do_kick(Config.s_ChanServ, 3, av); } } - if (WallForbid) - ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used SUSPEND on channel \2%s\2", u->nick, ci->name); + if (Config.WallForbid) + ircdproto->SendGlobops(Config.s_ChanServ, "\2%s\2 used SUSPEND on channel \2%s\2", u->nick, ci->name); - alog("%s: %s set SUSPEND for channel %s", s_ChanServ, u->nick, ci->name); - notice_lang(s_ChanServ, u, CHAN_SUSPEND_SUCCEEDED, chan); + alog("%s: %s set SUSPEND for channel %s", Config.s_ChanServ, u->nick, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SUSPEND_SUCCEEDED, chan); FOREACH_MOD(I_OnChanSuspend, OnChanSuspend(ci)); } else { - alog("%s: Valid SUSPEND for %s by %s failed", s_ChanServ, ci->name, u->nick); - notice_lang(s_ChanServ, u, CHAN_SUSPEND_FAILED, chan); + alog("%s: Valid SUSPEND for %s by %s failed", Config.s_ChanServ, ci->name, u->nick); + notice_lang(Config.s_ChanServ, u, CHAN_SUSPEND_FAILED, chan); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SUSPEND); + notice_help(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP_SUSPEND); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "SUSPEND", ForceForbidReason ? CHAN_SUSPEND_SYNTAX_REASON : CHAN_SUSPEND_SYNTAX); + syntax_error(Config.s_ChanServ, u, "SUSPEND", Config.ForceForbidReason ? CHAN_SUSPEND_SYNTAX_REASON : CHAN_SUSPEND_SYNTAX); } }; @@ -123,16 +123,16 @@ class CommandCSUnSuspend : public Command if (chan[0] != '#') { - notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_ERROR); + notice_lang(Config.s_ChanServ, u, CHAN_UNSUSPEND_ERROR); return MOD_CONT; } if (readonly) - notice_lang(s_ChanServ, u, READ_ONLY_MODE); + notice_lang(Config.s_ChanServ, u, READ_ONLY_MODE); /* Only UNSUSPEND already suspended channels */ if (!(ci->HasFlag(CI_SUSPENDED))) { - notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan); + notice_lang(Config.s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan); return MOD_CONT; } @@ -150,31 +150,31 @@ class CommandCSUnSuspend : public Command ci->forbidby = NULL; } - if (WallForbid) - ircdproto->SendGlobops(s_ChanServ, "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick, ci->name); + if (Config.WallForbid) + ircdproto->SendGlobops(Config.s_ChanServ, "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick, ci->name); - alog("%s: %s set UNSUSPEND for channel %s", s_ChanServ, u->nick, ci->name); - notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_SUCCEEDED, chan); + alog("%s: %s set UNSUSPEND for channel %s", Config.s_ChanServ, u->nick, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_UNSUSPEND_SUCCEEDED, chan); FOREACH_MOD(I_OnChanUnsuspend, OnChanUnsuspend(ci)); } else { - alog("%s: Valid UNSUSPEND for %s by %s failed", s_ChanServ, chan, u->nick); - notice_lang(s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan); + alog("%s: Valid UNSUSPEND for %s by %s failed", Config.s_ChanServ, chan, u->nick); + notice_lang(Config.s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_UNSUSPEND); + notice_help(Config.s_ChanServ, u, CHAN_SERVADMIN_HELP_UNSUSPEND); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "UNSUSPEND", CHAN_UNSUSPEND_SYNTAX); + syntax_error(Config.s_ChanServ, u, "UNSUSPEND", CHAN_UNSUSPEND_SYNTAX); } }; @@ -194,8 +194,8 @@ class CSSuspend : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SUSPEND); - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNSUSPEND); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_SUSPEND); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_UNSUSPEND); } }; diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index 37ab6d078..d570fa827 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -34,9 +34,9 @@ class CommandCSTopic : public Command ci = c->ci; if (!c) - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); else if (!check_access(u, ci, CA_TOPIC) && !u->nc->HasCommand("chanserv/topic")) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else { if (ci->last_topic) @@ -55,28 +55,28 @@ class CommandCSTopic : public Command c->topic_time = ci->last_topic_time; if (!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 && whosends(ci) == findbot(s_ChanServ)) + alog("%s: %s!%s@%s changed topic of %s as services admin.", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, c->name); + if (ircd->join2set && whosends(ci) == findbot(Config.s_ChanServ)) { - ircdproto->SendJoin(findbot(s_ChanServ), c->name, c->creation_time); - ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ); + ircdproto->SendJoin(findbot(Config.s_ChanServ), c->name, c->creation_time); + ircdproto->SendMode(NULL, c->name, "+o %s", Config.s_ChanServ); } ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic ? topic : "", c->topic_time); - if (ircd->join2set && whosends(ci) == findbot(s_ChanServ)) - ircdproto->SendPart(findbot(s_ChanServ), c->name, NULL); + if (ircd->join2set && whosends(ci) == findbot(Config.s_ChanServ)) + ircdproto->SendPart(findbot(Config.s_ChanServ), c->name, NULL); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_TOPIC); + notice_help(Config.s_ChanServ, u, CHAN_HELP_TOPIC); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "TOPIC", CHAN_TOPIC_SYNTAX); + syntax_error(Config.s_ChanServ, u, "TOPIC", CHAN_TOPIC_SYNTAX); } }; @@ -95,7 +95,7 @@ class CSTopic : public Module } void OnChanServHelp(User *u) { - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_TOPIC); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_TOPIC); } }; diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index dd27a47fb..01e84edac 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -132,7 +132,7 @@ class XOPBase : public Command if (readonly) { - notice_lang(s_ChanServ, u, messages[XOP_DISABLED]); + notice_lang(Config.s_ChanServ, u, messages[XOP_DISABLED]); return MOD_CONT; } @@ -140,19 +140,19 @@ class XOPBase : public Command if ((level >= ulev || ulev < ACCESS_AOP) && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } NickAlias *na = findnick(nick); if (!na) { - notice_lang(s_ChanServ, u, messages[XOP_NICKS_ONLY]); + notice_lang(Config.s_ChanServ, u, messages[XOP_NICKS_ONLY]); return MOD_CONT; } else if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_ChanServ, u, NICK_X_FORBIDDEN, na->nick); return MOD_CONT; } @@ -165,15 +165,15 @@ class XOPBase : public Command **/ if (access->level >= ulev && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } ++change; } - if (!change && ci->GetAccessCount() >= CSAccessMax) + if (!change && ci->GetAccessCount() >= Config.CSAccessMax) { - notice_lang(s_ChanServ, u, CHAN_XOP_REACHED_LIMIT, CSAccessMax); + notice_lang(Config.s_ChanServ, u, CHAN_XOP_REACHED_LIMIT, Config.CSAccessMax); return MOD_CONT; } @@ -189,17 +189,17 @@ class XOPBase : public Command access->creator = u->nick; } - alog("%s: %s!%s@%s (level %d) %s access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, change ? "changed" : "set", level, na->nick, nc->display, ci->name); + alog("%s: %s!%s@%s (level %d) %s access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, change ? "changed" : "set", level, na->nick, nc->display, ci->name); if (!change) { FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na->nick, level)); - notice_lang(s_ChanServ, u, messages[XOP_ADDED], nc->display, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_ADDED], nc->display, ci->name); } else { FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nick, level)); - notice_lang(s_ChanServ, u, messages[XOP_MOVED], nc->display, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_MOVED], nc->display, ci->name); } return MOD_CONT; @@ -220,13 +220,13 @@ class XOPBase : public Command if (readonly) { - notice_lang(s_ChanServ, u, messages[XOP_DISABLED]); + notice_lang(Config.s_ChanServ, u, messages[XOP_DISABLED]); return MOD_CONT; } if (!ci->GetAccessCount()) { - notice_lang(s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name); return MOD_CONT; } @@ -234,7 +234,7 @@ class XOPBase : public Command if ((level >= ulev || ulev < ACCESS_AOP) && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -246,26 +246,26 @@ class XOPBase : public Command if (!deleted) { if (perm) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (count == 1) { last = atoi(nick); - notice_lang(s_ChanServ, u, messages[XOP_NO_SUCH_ENTRY], last, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_NO_SUCH_ENTRY], last, ci->name); } else - notice_lang(s_ChanServ, u, messages[XOP_NO_MATCH], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_NO_MATCH], ci->name); } else if (deleted == 1) - notice_lang(s_ChanServ, u, messages[XOP_DELETED_ONE], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_DELETED_ONE], ci->name); else - notice_lang(s_ChanServ, u, messages[XOP_DELETED_SEVERAL], deleted, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_DELETED_SEVERAL], deleted, ci->name); } else { NickAlias *na = findnick(nick); if (!na) { - notice_lang(s_ChanServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_REGISTERED, nick); return MOD_CONT; } NickCore *nc = na->nc; @@ -273,18 +273,18 @@ class XOPBase : public Command if (!access) { - notice_lang(s_ChanServ, u, messages[XOP_NOT_FOUND], nick, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_NOT_FOUND], nick, ci->name); return MOD_CONT; } if (ulev <= access->level && !u->nc->HasPriv("chanserv/access/modify")) { deleted = 0; - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else { - notice_lang(s_ChanServ, u, messages[XOP_DELETED], access->nc->display, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_DELETED], access->nc->display, ci->name); access->nc = NULL; access->in_use = 0; @@ -311,13 +311,13 @@ class XOPBase : public Command if (level < ACCESS_AOP && !u->nc->HasCommand("chanserv/aop/list")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } if (!ci->GetAccessCount()) { - notice_lang(s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name); return MOD_CONT; } @@ -334,7 +334,7 @@ class XOPBase : public Command } } if (!sent_header) - notice_lang(s_ChanServ, u, messages[XOP_NO_MATCH], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_NO_MATCH], ci->name); return MOD_CONT; } @@ -343,19 +343,19 @@ class XOPBase : public Command { if (readonly) { - notice_lang(s_ChanServ, u, messages[XOP_DISABLED]); + notice_lang(Config.s_ChanServ, u, messages[XOP_DISABLED]); return MOD_CONT; } if (!ci->GetAccessCount()) { - notice_lang(s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name); return MOD_CONT; } if (!IsFounder(u, ci) && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -368,7 +368,7 @@ class XOPBase : public Command FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u)); - notice_lang(s_ChanServ, u, messages[XOP_CLEAR], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_CLEAR], ci->name); return MOD_CONT; } @@ -381,7 +381,7 @@ class XOPBase : public Command ChannelInfo *ci = cs_findchan(chan); if (!(ci->HasFlag(CI_XOP))) - notice_lang(s_ChanServ, u, CHAN_XOP_ACCESS, s_ChanServ); + notice_lang(Config.s_ChanServ, u, CHAN_XOP_ACCESS, Config.s_ChanServ); else if (cmd == "ADD") return this->DoAdd(u, params, ci, level, messages); else if (cmd == "DEL") @@ -424,13 +424,13 @@ class CommandCSQOP : public XOPBase bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_QOP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_QOP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "QOP", CHAN_QOP_SYNTAX); + syntax_error(Config.s_ChanServ, u, "QOP", CHAN_QOP_SYNTAX); } }; @@ -448,13 +448,13 @@ class CommandCSAOP : public XOPBase bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_AOP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_AOP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "AOP", CHAN_AOP_SYNTAX); + syntax_error(Config.s_ChanServ, u, "AOP", CHAN_AOP_SYNTAX); } }; @@ -472,13 +472,13 @@ class CommandCSHOP : public XOPBase bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_HOP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_HOP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "HOP", CHAN_HOP_SYNTAX); + syntax_error(Config.s_ChanServ, u, "HOP", CHAN_HOP_SYNTAX); } }; @@ -496,13 +496,13 @@ class CommandCSSOP : public XOPBase bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_SOP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_SOP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "SOP", CHAN_SOP_SYNTAX); + syntax_error(Config.s_ChanServ, u, "SOP", CHAN_SOP_SYNTAX); } }; @@ -520,13 +520,13 @@ class CommandCSVOP : public XOPBase bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_ChanServ, u, CHAN_HELP_VOP); + notice_help(Config.s_ChanServ, u, CHAN_HELP_VOP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_ChanServ, u, "VOP", CHAN_VOP_SYNTAX); + syntax_error(Config.s_ChanServ, u, "VOP", CHAN_VOP_SYNTAX); } }; @@ -553,13 +553,13 @@ class CSXOP : public Module void OnChanServHelp(User *u) { if (ModeManager::FindChannelModeByName(CMODE_OWNER)) - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_QOP); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_QOP); if (ModeManager::FindChannelModeByName(CMODE_PROTECT)) - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SOP); - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AOP); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_SOP); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_AOP); if (ModeManager::FindChannelModeByName(CMODE_HALFOP)) - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HOP); - notice_lang(s_ChanServ, u, CHAN_HELP_CMD_VOP); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_HOP); + notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_VOP); } }; @@ -609,11 +609,11 @@ int xop_list(User *u, int index, ChannelInfo *ci, int *sent_header, int xlev, in if (!*sent_header) { - notice_lang(s_ChanServ, u, xmsg, ci->name); + notice_lang(Config.s_ChanServ, u, xmsg, ci->name); *sent_header = 1; } - notice_lang(s_ChanServ, u, CHAN_XOP_LIST_FORMAT, index + 1, access->nc->display); + notice_lang(Config.s_ChanServ, u, CHAN_XOP_LIST_FORMAT, index + 1, access->nc->display); return 1; } diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c index d98792618..989fe693e 100644 --- a/src/core/enc_md5.c +++ b/src/core/enc_md5.c @@ -408,7 +408,7 @@ class EMD5 : public Module /* if we are NOT the first module in the list, * we want to re-encrypt the pass with the new encryption */ - if (stricmp(EncModuleList.begin()->c_str(), this->name.c_str())) + if (stricmp(Config.EncModuleList.begin()->c_str(), this->name.c_str())) { enc_encrypt(plaintext, strlen(password), password, PASSMAX -1 ); } diff --git a/src/core/enc_none.c b/src/core/enc_none.c index f8242f60a..4ba478789 100644 --- a/src/core/enc_none.c +++ b/src/core/enc_none.c @@ -63,7 +63,7 @@ class ENone : public Module /* if we are NOT the first module in the list, * we want to re-encrypt the pass with the new encryption */ - if (stricmp(EncModuleList.begin()->c_str(), this->name.c_str())) + if (stricmp(Config.EncModuleList.begin()->c_str(), this->name.c_str())) { enc_encrypt(plaintext, strlen(password), password, PASSMAX -1 ); } diff --git a/src/core/enc_old.c b/src/core/enc_old.c index d8f5dfdd5..c4691b60b 100644 --- a/src/core/enc_old.c +++ b/src/core/enc_old.c @@ -409,7 +409,7 @@ class EOld : public Module /* when we are NOT the first module in the list, * we want to re-encrypt the pass with the new encryption */ - if (stricmp(EncModuleList.begin()->c_str(), this->name.c_str())) + if (stricmp(Config.EncModuleList.begin()->c_str(), this->name.c_str())) { enc_encrypt(plaintext, strlen(password), password, PASSMAX -1 ); } diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.c index 87872241f..f3466ddf5 100644 --- a/src/core/enc_sha1.c +++ b/src/core/enc_sha1.c @@ -269,7 +269,7 @@ class ESHA1 : public Module /* when we are NOT the first module in the list, * we want to re-encrypt the pass with the new encryption */ - if (stricmp(EncModuleList.begin()->c_str(), this->name.c_str())) + if (stricmp(Config.EncModuleList.begin()->c_str(), this->name.c_str())) { enc_encrypt(plaintext, strlen(password), password, PASSMAX -1 ); } diff --git a/src/core/hs_del.c b/src/core/hs_del.c index 366bfc69c..3c2661197 100644 --- a/src/core/hs_del.c +++ b/src/core/hs_del.c @@ -30,27 +30,27 @@ class CommandHSDel : public Command { if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick); + notice_lang(Config.s_HostServ, u, NICK_X_FORBIDDEN, nick); return MOD_CONT; } alog("vHost for user \002%s\002 deleted by oper \002%s\002", nick, u->nick); delHostCore(nick); - notice_lang(s_HostServ, u, HOST_DEL, nick); + notice_lang(Config.s_HostServ, u, HOST_DEL, nick); } else - notice_lang(s_HostServ, u, HOST_NOREG, nick); + notice_lang(Config.s_HostServ, u, HOST_NOREG, nick); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_HostServ, u, HOST_HELP_DEL); + notice_help(Config.s_HostServ, u, HOST_HELP_DEL); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_HostServ, u, "DEL", HOST_DEL_SYNTAX); + syntax_error(Config.s_HostServ, u, "DEL", HOST_DEL_SYNTAX); } }; @@ -69,7 +69,7 @@ class HSDel : public Module } void OnHostServHelp(User *u) { - notice_lang(s_HostServ, u, HOST_HELP_CMD_DEL); + notice_lang(Config.s_HostServ, u, HOST_HELP_CMD_DEL); } }; diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c index ab7f5c352..bd874f30f 100644 --- a/src/core/hs_delall.c +++ b/src/core/hs_delall.c @@ -32,7 +32,7 @@ class CommandHSDelAll : public Command { if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick); + notice_lang(Config.s_HostServ, u, NICK_X_FORBIDDEN, nick); return MOD_CONT; } nc = na->nc; @@ -42,22 +42,22 @@ class CommandHSDelAll : public Command delHostCore(na->nick); } alog("vHosts for all nicks in group \002%s\002 deleted by oper \002%s\002", nc->display, u->nick); - notice_lang(s_HostServ, u, HOST_DELALL, nc->display); + notice_lang(Config.s_HostServ, u, HOST_DELALL, nc->display); } else - notice_lang(s_HostServ, u, HOST_NOREG, nick); + notice_lang(Config.s_HostServ, u, HOST_NOREG, nick); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_HostServ, u, HOST_HELP_DELALL); + notice_help(Config.s_HostServ, u, HOST_HELP_DELALL); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_HostServ, u, "DELALL", HOST_DELALL_SYNTAX); + syntax_error(Config.s_HostServ, u, "DELALL", HOST_DELALL_SYNTAX); } }; @@ -76,7 +76,7 @@ class HSDelAll : public Module } void OnHostServHelp(User *u) { - notice_lang(s_HostServ, u, HOST_HELP_CMD_DELALL); + notice_lang(Config.s_HostServ, u, HOST_HELP_CMD_DELALL); } }; diff --git a/src/core/hs_group.c b/src/core/hs_group.c index 87cfe9a43..4a2ef6036 100644 --- a/src/core/hs_group.c +++ b/src/core/hs_group.c @@ -52,23 +52,23 @@ class CommandHSGroup : public Command do_hs_sync(u->nc, vIdent, vHost, creator, time); if (tmp->vIdent) - notice_lang(s_HostServ, u, HOST_IDENT_GROUP, u->nc->display, vIdent, vHost); + notice_lang(Config.s_HostServ, u, HOST_IDENT_GROUP, u->nc->display, vIdent, vHost); else - notice_lang(s_HostServ, u, HOST_GROUP, u->nc->display, vHost); + notice_lang(Config.s_HostServ, u, HOST_GROUP, u->nc->display, vHost); delete [] vHost; if (vIdent) delete [] vIdent; delete [] creator; } else - notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED); + notice_lang(Config.s_HostServ, u, HOST_NOT_ASSIGNED); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_HostServ, u, HOST_HELP_GROUP); + notice_help(Config.s_HostServ, u, HOST_HELP_GROUP); return true; } }; @@ -88,7 +88,7 @@ class HSGroup : public Module } void OnHostServHelp(User *u) { - notice_lang(s_HostServ, u, HOST_HELP_CMD_GROUP); + notice_lang(Config.s_HostServ, u, HOST_HELP_CMD_GROUP); } }; diff --git a/src/core/hs_help.c b/src/core/hs_help.c index aa33e217b..f8fef8334 100644 --- a/src/core/hs_help.c +++ b/src/core/hs_help.c @@ -25,13 +25,13 @@ class CommandHSHelp : public Command CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { - mod_help_cmd(s_HostServ, u, HOSTSERV, params[0].c_str()); + mod_help_cmd(Config.s_HostServ, u, HOSTSERV, params[0].c_str()); return MOD_CONT; } void OnSyntaxError(User *u, const ci::string &subcommand) { - notice_help(s_HostServ, u, HOST_HELP, s_HostServ); + notice_help(Config.s_HostServ, u, HOST_HELP, Config.s_HostServ); FOREACH_MOD(I_OnHostServHelp, OnHostServHelp(u)); } }; diff --git a/src/core/hs_list.c b/src/core/hs_list.c index 99b6f9337..6d36f00dd 100644 --- a/src/core/hs_list.c +++ b/src/core/hs_list.c @@ -39,7 +39,7 @@ class CommandHSList : public Command current = head; if (!current) - notice_lang(s_HostServ, u, HOST_EMPTY); + notice_lang(Config.s_HostServ, u, HOST_EMPTY); else { /** @@ -53,7 +53,7 @@ class CommandHSList : public Command tmp = myStrGetOnlyToken((key + 1), '-', 0); /* Read FROM out */ if (!tmp) { - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); return MOD_CONT; } for (s = tmp; *s; ++s) @@ -61,7 +61,7 @@ class CommandHSList : public Command if (!isdigit(*s)) { delete [] tmp; - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); return MOD_CONT; } } @@ -70,7 +70,7 @@ class CommandHSList : public Command tmp = myStrGetTokenRemainder(key, '-', 1); /* Read TO out */ if (!tmp) { - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); return MOD_CONT; } for (s = tmp; *s; ++s) @@ -78,7 +78,7 @@ class CommandHSList : public Command if (!isdigit(*s)) { delete [] tmp; - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); return MOD_CONT; } } @@ -92,15 +92,15 @@ class CommandHSList : public Command { if (key) { - if ((Anope::Match(current->nick, key, false) || Anope::Match(current->vHost, key, false)) && display_counter < NSListMax) + if ((Anope::Match(current->nick, key, false) || Anope::Match(current->vHost, key, false)) && display_counter < Config.NSListMax) { ++display_counter; tm = localtime(¤t->time); strftime_lang(buf, sizeof(buf), u, 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); + notice_lang(Config.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); + notice_lang(Config.s_HostServ, u, HOST_ENTRY, counter, current->nick, current->vHost, current->creator, buf); } } else @@ -109,27 +109,27 @@ class CommandHSList : public Command * List the host if its in the display range, and not more * than NSListMax records have been displayed... **/ - if (((counter >= from && counter <= to) || (!from && !to)) && display_counter < NSListMax) + if (((counter >= from && counter <= to) || (!from && !to)) && display_counter < Config.NSListMax) { ++display_counter; tm = localtime(¤t->time); strftime_lang(buf, sizeof(buf), u, 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); + notice_lang(Config.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); + notice_lang(Config.s_HostServ, u, HOST_ENTRY, counter, current->nick, current->vHost, current->creator, buf); } } ++counter; current = current->next; } if (key) - notice_lang(s_HostServ, u, HOST_LIST_KEY_FOOTER, key, display_counter); + notice_lang(Config.s_HostServ, u, HOST_LIST_KEY_FOOTER, key, display_counter); else { if (from) - notice_lang(s_HostServ, u, HOST_LIST_RANGE_FOOTER, from, to); + notice_lang(Config.s_HostServ, u, HOST_LIST_RANGE_FOOTER, from, to); else - notice_lang(s_HostServ, u, HOST_LIST_FOOTER, display_counter); + notice_lang(Config.s_HostServ, u, HOST_LIST_FOOTER, display_counter); } } return MOD_CONT; @@ -137,7 +137,7 @@ class CommandHSList : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_HostServ, u, HOST_HELP_LIST); + notice_help(Config.s_HostServ, u, HOST_HELP_LIST); return true; } }; @@ -157,7 +157,7 @@ class HSList : public Module } void OnHostServHelp(User *u) { - notice_lang(s_HostServ, u, HOST_HELP_CMD_LIST); + notice_lang(Config.s_HostServ, u, HOST_HELP_CMD_LIST); } }; diff --git a/src/core/hs_off.c b/src/core/hs_off.c index 631853a4b..84f4527ee 100644 --- a/src/core/hs_off.c +++ b/src/core/hs_off.c @@ -30,11 +30,11 @@ class CommandHSOff : public Command vhost = getvHost(u->nick); vident = getvIdent(u->nick); if (!vhost && !vident) - notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED); + notice_lang(Config.s_HostServ, u, HOST_NOT_ASSIGNED); else { ircdproto->SendVhostDel(u); - notice_lang(s_HostServ, u, HOST_OFF); + notice_lang(Config.s_HostServ, u, HOST_OFF); } return MOD_CONT; @@ -42,7 +42,7 @@ class CommandHSOff : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_HostServ, u, HOST_HELP_OFF); + notice_help(Config.s_HostServ, u, HOST_HELP_OFF); return true; } }; @@ -62,7 +62,7 @@ class HSOff : public Module } void OnHostServHelp(User *u) { - notice_lang(s_HostServ, u, HOST_HELP_CMD_OFF); + notice_lang(Config.s_HostServ, u, HOST_HELP_CMD_OFF); } }; diff --git a/src/core/hs_on.c b/src/core/hs_on.c index 89752aa03..985ce3e13 100644 --- a/src/core/hs_on.c +++ b/src/core/hs_on.c @@ -30,13 +30,13 @@ class CommandHSOn : public Command vHost = getvHost(u->nick); vIdent = getvIdent(u->nick); if (!vHost) - notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED); + notice_lang(Config.s_HostServ, u, HOST_NOT_ASSIGNED); else { if (vIdent) - notice_lang(s_HostServ, u, HOST_IDENT_ACTIVATED, vIdent, vHost); + notice_lang(Config.s_HostServ, u, HOST_IDENT_ACTIVATED, vIdent, vHost); else - notice_lang(s_HostServ, u, HOST_ACTIVATED, vHost); + notice_lang(Config.s_HostServ, u, HOST_ACTIVATED, vHost); ircdproto->SendVhost(u->nick, vIdent, vHost); if (ircd->vhost) { @@ -57,7 +57,7 @@ class CommandHSOn : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_HostServ, u, HOST_HELP_ON); + notice_help(Config.s_HostServ, u, HOST_HELP_ON); return true; } }; @@ -77,7 +77,7 @@ class HSOn : public Module } void OnHostServHelp(User *u) { - notice_lang(s_HostServ, u, HOST_HELP_CMD_ON); + notice_lang(Config.s_HostServ, u, HOST_HELP_CMD_ON); } }; diff --git a/src/core/hs_set.c b/src/core/hs_set.c index 0159d8e07..75c3b85ec 100644 --- a/src/core/hs_set.c +++ b/src/core/hs_set.c @@ -40,14 +40,14 @@ class CommandHSSet : public Command rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */ if (!rawhostmask) { - notice_lang(s_HostServ, u, HOST_SET_SYNTAX, s_HostServ); + notice_lang(Config.s_HostServ, u, HOST_SET_SYNTAX, Config.s_HostServ); delete [] vIdent; delete [] hostmask; return MOD_CONT; } if (strlen(vIdent) > USERMAX - 1) { - notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX); + notice_lang(Config.s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX); delete [] vIdent; delete [] rawhostmask; delete [] hostmask; @@ -59,7 +59,7 @@ class CommandHSSet : public Command { if (!isvalidchar(*s)) { - notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR); + notice_lang(Config.s_HostServ, u, HOST_SET_IDENT_ERROR); delete [] vIdent; delete [] rawhostmask; delete [] hostmask; @@ -69,7 +69,7 @@ class CommandHSSet : public Command } if (!ircd->vident) { - notice_lang(s_HostServ, u, HOST_NO_VIDENT); + notice_lang(Config.s_HostServ, u, HOST_NO_VIDENT); delete [] vIdent; delete [] rawhostmask; delete [] hostmask; @@ -80,7 +80,7 @@ class CommandHSSet : public Command snprintf(hostmask, HOSTMAX - 1, "%s", rawhostmask); else { - notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX); + notice_lang(Config.s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX); if (vIdent) { delete [] vIdent; @@ -92,7 +92,7 @@ class CommandHSSet : public Command if (!isValidHost(hostmask, 3)) { - notice_lang(s_HostServ, u, HOST_SET_ERROR); + notice_lang(Config.s_HostServ, u, HOST_SET_ERROR); if (vIdent) { delete [] vIdent; @@ -109,7 +109,7 @@ class CommandHSSet : public Command { if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick); + notice_lang(Config.s_HostServ, u, NICK_X_FORBIDDEN, nick); if (vIdent) { delete [] vIdent; @@ -124,12 +124,12 @@ class CommandHSSet : public Command alog("vHost for user \002%s\002 set to \002%s\002 by oper \002%s\002", nick, hostmask, u->nick); addHostCore(nick, vIdent, hostmask, u->nick, tmp_time); if (vIdent) - notice_lang(s_HostServ, u, HOST_IDENT_SET, nick, vIdent, hostmask); + notice_lang(Config.s_HostServ, u, HOST_IDENT_SET, nick, vIdent, hostmask); else - notice_lang(s_HostServ, u, HOST_SET, nick, hostmask); + notice_lang(Config.s_HostServ, u, HOST_SET, nick, hostmask); } else - notice_lang(s_HostServ, u, HOST_NOREG, nick); + notice_lang(Config.s_HostServ, u, HOST_NOREG, nick); delete [] hostmask; if (vIdent) { @@ -141,13 +141,13 @@ class CommandHSSet : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_HostServ, u, HOST_HELP_SET); + notice_help(Config.s_HostServ, u, HOST_HELP_SET); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_HostServ, u, "SET", HOST_SET_SYNTAX); + syntax_error(Config.s_HostServ, u, "SET", HOST_SET_SYNTAX); } }; @@ -166,7 +166,7 @@ class HSSet : public Module } void OnHostServHelp(User *u) { - notice_lang(s_HostServ, u, HOST_HELP_CMD_SET); + notice_lang(Config.s_HostServ, u, HOST_HELP_CMD_SET); } }; diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c index a018814e2..7ab5420cd 100644 --- a/src/core/hs_setall.c +++ b/src/core/hs_setall.c @@ -42,14 +42,14 @@ class CommandHSSetAll : public Command rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */ if (!rawhostmask) { - notice_lang(s_HostServ, u, HOST_SETALL_SYNTAX, s_HostServ); + notice_lang(Config.s_HostServ, u, HOST_SETALL_SYNTAX, Config.s_HostServ); delete [] vIdent; delete [] hostmask; return MOD_CONT; } if (strlen(vIdent) > USERMAX - 1) { - notice_lang(s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX); + notice_lang(Config.s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX); delete [] vIdent; delete [] rawhostmask; delete [] hostmask; @@ -61,7 +61,7 @@ class CommandHSSetAll : public Command { if (!isvalidchar(*s)) { - notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR); + notice_lang(Config.s_HostServ, u, HOST_SET_IDENT_ERROR); delete [] vIdent; delete [] rawhostmask; delete [] hostmask; @@ -71,7 +71,7 @@ class CommandHSSetAll : public Command } if (!ircd->vident) { - notice_lang(s_HostServ, u, HOST_NO_VIDENT); + notice_lang(Config.s_HostServ, u, HOST_NO_VIDENT); delete [] vIdent; delete [] rawhostmask; delete [] hostmask; @@ -83,7 +83,7 @@ class CommandHSSetAll : public Command snprintf(hostmask, HOSTMAX - 1, "%s", rawhostmask); else { - notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX); + notice_lang(Config.s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX); if (vIdent) { delete [] vIdent; @@ -95,7 +95,7 @@ class CommandHSSetAll : public Command if (!isValidHost(hostmask, 3)) { - notice_lang(s_HostServ, u, HOST_SET_ERROR); + notice_lang(Config.s_HostServ, u, HOST_SET_ERROR); if (vIdent) { delete [] vIdent; @@ -111,7 +111,7 @@ class CommandHSSetAll : public Command { if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick); + notice_lang(Config.s_HostServ, u, NICK_X_FORBIDDEN, nick); if (vIdent) { delete [] vIdent; delete [] rawhostmask; @@ -125,12 +125,12 @@ class CommandHSSetAll : public Command alog("vHost for all nicks in group \002%s\002 set to \002%s\002 by oper \002%s\002", nick, hostmask, u->nick); do_hs_sync(na->nc, vIdent, hostmask, u->nick, tmp_time); if (vIdent) - notice_lang(s_HostServ, u, HOST_IDENT_SETALL, nick, vIdent, hostmask); + notice_lang(Config.s_HostServ, u, HOST_IDENT_SETALL, nick, vIdent, hostmask); else - notice_lang(s_HostServ, u, HOST_SETALL, nick, hostmask); + notice_lang(Config.s_HostServ, u, HOST_SETALL, nick, hostmask); } else - notice_lang(s_HostServ, u, HOST_NOREG, nick); + notice_lang(Config.s_HostServ, u, HOST_NOREG, nick); if (vIdent) { delete [] vIdent; @@ -142,13 +142,13 @@ class CommandHSSetAll : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_HostServ, u, HOST_HELP_SETALL); + notice_help(Config.s_HostServ, u, HOST_HELP_SETALL); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_HostServ, u, "SETALL", HOST_SETALL_SYNTAX); + syntax_error(Config.s_HostServ, u, "SETALL", HOST_SETALL_SYNTAX); } }; @@ -167,7 +167,7 @@ class HSSetAll : public Module } void OnHostServHelp(User *u) { - notice_lang(s_HostServ, u, HOST_HELP_CMD_SETALL); + notice_lang(Config.s_HostServ, u, HOST_HELP_CMD_SETALL); } }; diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c index ca6019f39..4c290f738 100644 --- a/src/core/ms_cancel.c +++ b/src/core/ms_cancel.c @@ -32,13 +32,13 @@ class CommandMSCancel : public Command MemoInfo *mi; if (!u->IsRecognized()) - notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ); + notice_lang(Config.s_MemoServ, u, NICK_IDENTIFY_REQUIRED, Config.s_NickServ); else if (!(mi = getmemoinfo(name, &ischan, &isforbid))) { if (isforbid) - notice_lang(s_MemoServ, u, ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, name); + notice_lang(Config.s_MemoServ, u, ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, name); else - notice_lang(s_MemoServ, u, ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, name); + notice_lang(Config.s_MemoServ, u, ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, name); } else { @@ -49,25 +49,25 @@ class CommandMSCancel : public Command if ((mi->memos[i]->HasFlag(MF_UNREAD)) && !stricmp(mi->memos[i]->sender, u->nc->display) && !mi->memos[i]->HasFlag(MF_NOTIFYS)) { delmemo(mi, mi->memos[i]->number); - notice_lang(s_MemoServ, u, MEMO_CANCELLED, name); + notice_lang(Config.s_MemoServ, u, MEMO_CANCELLED, name); return MOD_CONT; } } - notice_lang(s_MemoServ, u, MEMO_CANCEL_NONE); + notice_lang(Config.s_MemoServ, u, MEMO_CANCEL_NONE); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_MemoServ, u, MEMO_HELP_CANCEL); + notice_help(Config.s_MemoServ, u, MEMO_HELP_CANCEL); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_MemoServ, u, "CANCEL", MEMO_CANCEL_SYNTAX); + syntax_error(Config.s_MemoServ, u, "CANCEL", MEMO_CANCEL_SYNTAX); } }; @@ -85,7 +85,7 @@ class MSCancel : public Module } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CANCEL); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_CANCEL); } }; diff --git a/src/core/ms_check.c b/src/core/ms_check.c index b4c5481f5..c396aed17 100644 --- a/src/core/ms_check.c +++ b/src/core/ms_check.c @@ -33,18 +33,18 @@ class CommandMSCheck : public Command if (!u->IsRecognized()) { - notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ); + notice_lang(Config.s_MemoServ, u, NICK_IDENTIFY_REQUIRED, Config.s_NickServ); return MOD_CONT; } else if (!(na = findnick(recipient))) { - notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, recipient); + notice_lang(Config.s_MemoServ, u, NICK_X_NOT_REGISTERED, recipient); return MOD_CONT; } if ((na->HasFlag(NS_FORBIDDEN))) { - notice_lang(s_MemoServ, u, NICK_X_FORBIDDEN, recipient); + notice_lang(Config.s_MemoServ, u, NICK_X_FORBIDDEN, recipient); return MOD_CONT; } @@ -63,28 +63,28 @@ class CommandMSCheck : public Command strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, tm); if (mi->memos[i]->HasFlag(MF_UNREAD)) - notice_lang(s_MemoServ, u, MEMO_CHECK_NOT_READ, na->nick, timebuf); + notice_lang(Config.s_MemoServ, u, MEMO_CHECK_NOT_READ, na->nick, timebuf); else - notice_lang(s_MemoServ, u, MEMO_CHECK_READ, na->nick, timebuf); + notice_lang(Config.s_MemoServ, u, MEMO_CHECK_READ, na->nick, timebuf); break; } } if (!found) - notice_lang(s_MemoServ, u, MEMO_CHECK_NO_MEMO, na->nick); + notice_lang(Config.s_MemoServ, u, MEMO_CHECK_NO_MEMO, na->nick); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_MemoServ, u, MEMO_HELP_CHECK); + notice_help(Config.s_MemoServ, u, MEMO_HELP_CHECK); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_MemoServ, u, "CHECK", MEMO_CHECK_SYNTAX); + syntax_error(Config.s_MemoServ, u, "CHECK", MEMO_CHECK_SYNTAX); } }; @@ -102,7 +102,7 @@ class MSCheck : public Module } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CHECK); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_CHECK); } }; diff --git a/src/core/ms_del.c b/src/core/ms_del.c index bdd3f2eff..6f6988ac1 100644 --- a/src/core/ms_del.c +++ b/src/core/ms_del.c @@ -40,17 +40,17 @@ class CommandMSDel : public Command if (!(ci = cs_findchan(chan.c_str()))) { - notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); + notice_lang(Config.s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); return MOD_CONT; } else if (readonly) { - notice_lang(s_MemoServ, u, READ_ONLY_MODE); + notice_lang(Config.s_MemoServ, u, READ_ONLY_MODE); return MOD_CONT; } else if (!check_access(u, ci, CA_MEMO)) { - notice_lang(s_MemoServ, u, ACCESS_DENIED); + notice_lang(Config.s_MemoServ, u, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -64,9 +64,9 @@ class CommandMSDel : public Command else if (mi->memos.empty()) { if (!chan.empty()) - notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan.c_str()); + notice_lang(Config.s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan.c_str()); else - notice_lang(s_MemoServ, u, MEMO_HAVE_NO_MEMOS); + notice_lang(Config.s_MemoServ, u, MEMO_HAVE_NO_MEMOS); } else { @@ -88,18 +88,18 @@ class CommandMSDel : public Command else end += snprintf(end, sizeof(buf) - (end - buf), ",%d", last); /* "buf+1" here because *buf == ',' */ - notice_lang(s_MemoServ, u, MEMO_DELETED_SEVERAL, buf + 1); + notice_lang(Config.s_MemoServ, u, MEMO_DELETED_SEVERAL, buf + 1); } else - notice_lang(s_MemoServ, u, MEMO_DELETED_ONE, last); + notice_lang(Config.s_MemoServ, u, MEMO_DELETED_ONE, last); } else { /* No memos were deleted. Tell them so. */ if (count == 1) - notice_lang(s_MemoServ, u, MEMO_DOES_NOT_EXIST, atoi(numstr.c_str())); + notice_lang(Config.s_MemoServ, u, MEMO_DOES_NOT_EXIST, atoi(numstr.c_str())); else - notice_lang(s_MemoServ, u, MEMO_DELETED_NONE); + notice_lang(Config.s_MemoServ, u, MEMO_DELETED_NONE); } } else if (numstr == "LAST") @@ -108,7 +108,7 @@ class CommandMSDel : public Command for (i = 0; i < mi->memos.size(); ++i) last = mi->memos[i]->number; delmemo(mi, last); - notice_lang(s_MemoServ, u, MEMO_DELETED_ONE, last); + notice_lang(Config.s_MemoServ, u, MEMO_DELETED_ONE, last); } else { @@ -120,9 +120,9 @@ class CommandMSDel : public Command } mi->memos.clear(); if (!chan.empty()) - notice_lang(s_MemoServ, u, MEMO_CHAN_DELETED_ALL, chan.c_str()); + notice_lang(Config.s_MemoServ, u, MEMO_CHAN_DELETED_ALL, chan.c_str()); else - notice_lang(s_MemoServ, u, MEMO_DELETED_ALL); + notice_lang(Config.s_MemoServ, u, MEMO_DELETED_ALL); } /* Reset the order */ @@ -134,13 +134,13 @@ class CommandMSDel : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_MemoServ, u, MEMO_HELP_DEL); + notice_help(Config.s_MemoServ, u, MEMO_HELP_DEL); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_MemoServ, u, "DEL", MEMO_DEL_SYNTAX); + syntax_error(Config.s_MemoServ, u, "DEL", MEMO_DEL_SYNTAX); } }; @@ -158,7 +158,7 @@ class MSDel : public Module } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_DEL); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_DEL); } }; diff --git a/src/core/ms_help.c b/src/core/ms_help.c index ae26da622..da45e2126 100644 --- a/src/core/ms_help.c +++ b/src/core/ms_help.c @@ -25,15 +25,15 @@ class CommandMSHelp : public Command CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { - mod_help_cmd(s_MemoServ, u, MEMOSERV, params[0].c_str()); + mod_help_cmd(Config.s_MemoServ, u, MEMOSERV, params[0].c_str()); return MOD_CONT; } void OnSyntaxError(User *u, const ci::string &subcommand) { - notice_help(s_MemoServ, u, MEMO_HELP_HEADER); + notice_help(Config.s_MemoServ, u, MEMO_HELP_HEADER); FOREACH_MOD(I_OnMemoServHelp, OnMemoServHelp(u)); - notice_help(s_MemoServ, u, MEMO_HELP_FOOTER, s_ChanServ); + notice_help(Config.s_MemoServ, u, MEMO_HELP_FOOTER, Config.s_ChanServ); } }; diff --git a/src/core/ms_info.c b/src/core/ms_info.c index d78272f3f..cbda55b0f 100644 --- a/src/core/ms_info.c +++ b/src/core/ms_info.c @@ -35,12 +35,12 @@ class CommandMSInfo : public Command na = findnick(name); if (!na) { - notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, name); + notice_lang(Config.s_MemoServ, u, NICK_X_NOT_REGISTERED, name); return MOD_CONT; } else if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_MemoServ, u, NICK_X_FORBIDDEN, name); + notice_lang(Config.s_MemoServ, u, NICK_X_FORBIDDEN, name); return MOD_CONT; } mi = &na->nc->memos; @@ -50,12 +50,12 @@ class CommandMSInfo : public Command { if (!(ci = cs_findchan(name))) { - notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, name); + notice_lang(Config.s_MemoServ, u, CHAN_X_NOT_REGISTERED, name); return MOD_CONT; } else if (!check_access(u, ci, CA_MEMO)) { - notice_lang(s_MemoServ, u, ACCESS_DENIED); + notice_lang(Config.s_MemoServ, u, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -63,7 +63,7 @@ class CommandMSInfo : public Command } else if (name) /* It's not a chan and we aren't services admin */ { - notice_lang(s_MemoServ, u, ACCESS_DENIED); + notice_lang(Config.s_MemoServ, u, ACCESS_DENIED); return MOD_CONT; } else @@ -75,13 +75,13 @@ class CommandMSInfo : public Command if (name && (ci || na->nc != u->nc)) { if (mi->memos.empty()) - notice_lang(s_MemoServ, u, MEMO_INFO_X_NO_MEMOS, name); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_NO_MEMOS, name); else if (mi->memos.size() == 1) { if (mi->memos[0]->HasFlag(MF_UNREAD)) - notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMO_UNREAD, name); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_MEMO_UNREAD, name); else - notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMO, name); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_MEMO, name); } else { @@ -92,55 +92,55 @@ class CommandMSInfo : public Command ++count; } if (count == mi->memos.size()) - notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_ALL_UNREAD, name, count); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_MEMOS_ALL_UNREAD, name, count); else if (!count) - notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS, name, mi->memos.size()); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_MEMOS, name, mi->memos.size()); else if (count == 1) - notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_ONE_UNREAD, name, mi->memos.size()); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_MEMOS_ONE_UNREAD, name, mi->memos.size()); else - notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_SOME_UNREAD, name, mi->memos.size(), count); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_MEMOS_SOME_UNREAD, name, mi->memos.size(), count); } if (!mi->memomax) { if (hardmax) - notice_lang(s_MemoServ, u, MEMO_INFO_X_HARD_LIMIT, name, mi->memomax); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_HARD_LIMIT, name, mi->memomax); else - notice_lang(s_MemoServ, u, MEMO_INFO_X_LIMIT, name, mi->memomax); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_LIMIT, name, mi->memomax); } else if (mi->memomax > 0) { if (hardmax) - notice_lang(s_MemoServ, u, MEMO_INFO_X_HARD_LIMIT, name, mi->memomax); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_HARD_LIMIT, name, mi->memomax); else - notice_lang(s_MemoServ, u, MEMO_INFO_X_LIMIT, name, mi->memomax); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_LIMIT, name, mi->memomax); } else - notice_lang(s_MemoServ, u, MEMO_INFO_X_NO_LIMIT, name); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_NO_LIMIT, name); /* I ripped this code out of ircservices 4.4.5, since I didn't want to rewrite the whole thing (it pisses me off). */ if (na) { if (na->nc->HasFlag(NI_MEMO_RECEIVE) && na->nc->HasFlag(NI_MEMO_SIGNON)) - notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_ON, name); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_NOTIFY_ON, name); else if (na->nc->HasFlag(NI_MEMO_RECEIVE)) - notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_RECEIVE, name); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_NOTIFY_RECEIVE, name); else if (na->nc->HasFlag(NI_MEMO_SIGNON)) - notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_SIGNON, name); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_NOTIFY_SIGNON, name); else - notice_lang(s_MemoServ, u, MEMO_INFO_X_NOTIFY_OFF, name); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_X_NOTIFY_OFF, name); } } else /* !name || (!ci || na->nc == u->nc) */ { if (mi->memos.empty()) - notice_lang(s_MemoServ, u, MEMO_INFO_NO_MEMOS); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_NO_MEMOS); else if (mi->memos.size() == 1) { if (mi->memos[0]->HasFlag(MF_UNREAD)) - notice_lang(s_MemoServ, u, MEMO_INFO_MEMO_UNREAD); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_MEMO_UNREAD); else - notice_lang(s_MemoServ, u, MEMO_INFO_MEMO); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_MEMO); } else { @@ -151,41 +151,41 @@ class CommandMSInfo : public Command ++count; } if (count == mi->memos.size()) - notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS_ALL_UNREAD, count); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_MEMOS_ALL_UNREAD, count); else if (!count) - notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS, mi->memos.size()); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_MEMOS, mi->memos.size()); else if (count == 1) - notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS_ONE_UNREAD, mi->memos.size()); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_MEMOS_ONE_UNREAD, mi->memos.size()); else - notice_lang(s_MemoServ, u, MEMO_INFO_MEMOS_SOME_UNREAD, mi->memos.size(), count); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_MEMOS_SOME_UNREAD, mi->memos.size(), count); } if (!mi->memomax) { if (!u->nc->IsServicesOper() && hardmax) - notice_lang(s_MemoServ, u, MEMO_INFO_HARD_LIMIT_ZERO); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_HARD_LIMIT_ZERO); else - notice_lang(s_MemoServ, u, MEMO_INFO_LIMIT_ZERO); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_LIMIT_ZERO); } else if (mi->memomax > 0) { if (!u->nc->IsServicesOper() && hardmax) - notice_lang(s_MemoServ, u, MEMO_INFO_HARD_LIMIT, mi->memomax); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_HARD_LIMIT, mi->memomax); else - notice_lang(s_MemoServ, u, MEMO_INFO_LIMIT, mi->memomax); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_LIMIT, mi->memomax); } else - notice_lang(s_MemoServ, u, MEMO_INFO_NO_LIMIT); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_NO_LIMIT); /* Ripped too. But differently because of a seg fault (loughs) */ if (u->nc->HasFlag(NI_MEMO_RECEIVE) && u->nc->HasFlag(NI_MEMO_SIGNON)) - notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_ON); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_NOTIFY_ON); else if (u->nc->HasFlag(NI_MEMO_RECEIVE)) - notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_RECEIVE); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_NOTIFY_RECEIVE); else if (u->nc->HasFlag(NI_MEMO_SIGNON)) - notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_SIGNON); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_NOTIFY_SIGNON); else - notice_lang(s_MemoServ, u, MEMO_INFO_NOTIFY_OFF); + notice_lang(Config.s_MemoServ, u, MEMO_INFO_NOTIFY_OFF); } return MOD_CONT; } @@ -193,9 +193,9 @@ class CommandMSInfo : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (u->nc && u->nc->IsServicesOper()) - notice_help(s_MemoServ, u, MEMO_SERVADMIN_HELP_INFO); + notice_help(Config.s_MemoServ, u, MEMO_SERVADMIN_HELP_INFO); else - notice_help(s_MemoServ, u, MEMO_HELP_INFO); + notice_help(Config.s_MemoServ, u, MEMO_HELP_INFO); return true; } @@ -215,7 +215,7 @@ class MSInfo : public Module } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_INFO); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_INFO); } }; diff --git a/src/core/ms_list.c b/src/core/ms_list.c index 6152ef0e7..40c35d851 100644 --- a/src/core/ms_list.c +++ b/src/core/ms_list.c @@ -39,12 +39,12 @@ class CommandMSList : public Command if (!(ci = cs_findchan(chan.c_str()))) { - notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); + notice_lang(Config.s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); return MOD_CONT; } else if (!check_access(u, ci, CA_MEMO)) { - notice_lang(s_MemoServ, u, ACCESS_DENIED); + notice_lang(Config.s_MemoServ, u, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -58,9 +58,9 @@ class CommandMSList : public Command else if (!mi->memos.size()) { if (!chan.empty()) - notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan.c_str()); + notice_lang(Config.s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan.c_str()); else - notice_lang(s_MemoServ, u, MEMO_HAVE_NO_MEMOS); + notice_lang(Config.s_MemoServ, u, MEMO_HAVE_NO_MEMOS); } else { @@ -79,9 +79,9 @@ class CommandMSList : public Command if (i == mi->memos.size()) { if (!chan.empty()) - notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str()); + notice_lang(Config.s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str()); else - notice_lang(s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS); + notice_lang(Config.s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS); return MOD_CONT; } } @@ -98,13 +98,13 @@ class CommandMSList : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_MemoServ, u, MEMO_HELP_LIST); + notice_help(Config.s_MemoServ, u, MEMO_HELP_LIST); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_MemoServ, u, "LIST", MEMO_LIST_SYNTAX); + syntax_error(Config.s_MemoServ, u, "LIST", MEMO_LIST_SYNTAX); } }; @@ -122,7 +122,7 @@ class MSList : public Module } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_LIST); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_LIST); } }; @@ -170,17 +170,17 @@ int list_memo(User *u, int index, MemoInfo *mi, int *sent_header, int newi, cons if (!*sent_header) { if (chan) - notice_lang(s_MemoServ, u, newi ? MEMO_LIST_CHAN_NEW_MEMOS : MEMO_LIST_CHAN_MEMOS, chan, s_MemoServ, chan); + notice_lang(Config.s_MemoServ, u, newi ? MEMO_LIST_CHAN_NEW_MEMOS : MEMO_LIST_CHAN_MEMOS, chan, Config.s_MemoServ, chan); else - notice_lang(s_MemoServ, u, newi ? MEMO_LIST_NEW_MEMOS : MEMO_LIST_MEMOS, u->nick, s_MemoServ); - notice_lang(s_MemoServ, u, MEMO_LIST_HEADER); + notice_lang(Config.s_MemoServ, u, newi ? MEMO_LIST_NEW_MEMOS : MEMO_LIST_MEMOS, u->nick, Config.s_MemoServ); + notice_lang(Config.s_MemoServ, u, MEMO_LIST_HEADER); *sent_header = 1; } m = mi->memos[index]; tm = *localtime(&m->time); strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, &tm); timebuf[sizeof(timebuf) - 1] = 0; /* just in case */ - notice_lang(s_MemoServ, u, MEMO_LIST_FORMAT, (m->HasFlag(MF_UNREAD)) ? '*' : ' ', m->number, m->sender, timebuf); + notice_lang(Config.s_MemoServ, u, MEMO_LIST_FORMAT, (m->HasFlag(MF_UNREAD)) ? '*' : ' ', m->number, m->sender, timebuf); return 1; } diff --git a/src/core/ms_read.c b/src/core/ms_read.c index 307439d1e..2c2418351 100644 --- a/src/core/ms_read.c +++ b/src/core/ms_read.c @@ -40,12 +40,12 @@ class CommandMSRead : public Command if (!(ci = cs_findchan(chan.c_str()))) { - notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); + notice_lang(Config.s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); return MOD_CONT; } else if (!check_access(u, ci, CA_MEMO)) { - notice_lang(s_MemoServ, u, ACCESS_DENIED); + notice_lang(Config.s_MemoServ, u, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -60,9 +60,9 @@ class CommandMSRead : public Command else if (mi->memos.empty()) { if (!chan.empty()) - notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan.c_str()); + notice_lang(Config.s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan.c_str()); else - notice_lang(s_MemoServ, u, MEMO_HAVE_NO_MEMOS); + notice_lang(Config.s_MemoServ, u, MEMO_HAVE_NO_MEMOS); } else { int i; @@ -81,9 +81,9 @@ class CommandMSRead : public Command if (!readcount) { if (!chan.empty()) - notice_lang(s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str()); + notice_lang(Config.s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str()); else - notice_lang(s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS); + notice_lang(Config.s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS); } } else if (numstr == "LAST") @@ -96,9 +96,9 @@ class CommandMSRead : public Command if (!process_numlist(numstr.c_str(), &count, read_memo_callback, u, mi, chan.c_str())) { if (count == 1) - notice_lang(s_MemoServ, u, MEMO_DOES_NOT_EXIST, num); + notice_lang(Config.s_MemoServ, u, MEMO_DOES_NOT_EXIST, num); else - notice_lang(s_MemoServ, u, MEMO_LIST_NOT_FOUND, numstr.c_str()); + notice_lang(Config.s_MemoServ, u, MEMO_LIST_NOT_FOUND, numstr.c_str()); } } } @@ -107,13 +107,13 @@ class CommandMSRead : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_MemoServ, u, MEMO_HELP_READ); + notice_help(Config.s_MemoServ, u, MEMO_HELP_READ); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_MemoServ, u, "READ", MEMO_READ_SYNTAX); + syntax_error(Config.s_MemoServ, u, "READ", MEMO_READ_SYNTAX); } }; @@ -131,7 +131,7 @@ class MSRead : public Module } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_READ); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_READ); } }; @@ -178,10 +178,10 @@ int read_memo(User *u, int index, MemoInfo *mi, const char *chan) strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, &tm); timebuf[sizeof(timebuf) - 1] = 0; if (chan) - notice_lang(s_MemoServ, u, MEMO_CHAN_HEADER, m->number, m->sender, timebuf, s_MemoServ, chan, m->number); + notice_lang(Config.s_MemoServ, u, MEMO_CHAN_HEADER, m->number, m->sender, timebuf, Config.s_MemoServ, chan, m->number); else - notice_lang(s_MemoServ, u, MEMO_HEADER, m->number, m->sender, timebuf, s_MemoServ, m->number); - notice_lang(s_MemoServ, u, MEMO_TEXT, m->text); + notice_lang(Config.s_MemoServ, u, MEMO_HEADER, m->number, m->sender, timebuf, Config.s_MemoServ, m->number); + notice_lang(Config.s_MemoServ, u, MEMO_TEXT, m->text); m->UnsetFlag(MF_UNREAD); /* Check if a receipt notification was requested */ diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c index f17f17c2e..36acc200d 100644 --- a/src/core/ms_rsend.c +++ b/src/core/ms_rsend.c @@ -34,33 +34,33 @@ class CommandMSRSend : public Command { if (na->nc == u->nc) { - notice_lang(s_MemoServ, u, MEMO_NO_RSEND_SELF); + notice_lang(Config.s_MemoServ, u, MEMO_NO_RSEND_SELF); return MOD_CONT; } else { - notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_MemoServ, u, NICK_X_NOT_REGISTERED, nick); return MOD_CONT; } } - if (MSMemoReceipt == 1) + if (Config.MSMemoReceipt == 1) { /* Services opers and above can use rsend */ if (u->nc->IsServicesOper()) memo_send(u, nick, text, z); else - notice_lang(s_MemoServ, u, ACCESS_DENIED); + notice_lang(Config.s_MemoServ, u, ACCESS_DENIED); } - else if (MSMemoReceipt == 2) + else if (Config.MSMemoReceipt == 2) /* Everybody can use rsend */ memo_send(u, nick, text, z); else { /* rsend has been disabled */ if (debug) - alog("debug: MSMemoReceipt is set misconfigured to %d", MSMemoReceipt); - notice_lang(s_MemoServ, u, MEMO_RSEND_DISABLED); + alog("debug: MSMemoReceipt is set misconfigured to %d", Config.MSMemoReceipt); + notice_lang(Config.s_MemoServ, u, MEMO_RSEND_DISABLED); } return MOD_CONT; @@ -68,13 +68,13 @@ class CommandMSRSend : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_MemoServ, u, MEMO_HELP_RSEND); + notice_help(Config.s_MemoServ, u, MEMO_HELP_RSEND); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_MemoServ, u, "RSEND", MEMO_RSEND_SYNTAX); + syntax_error(Config.s_MemoServ, u, "RSEND", MEMO_RSEND_SYNTAX); } }; @@ -88,14 +88,14 @@ class MSRSend : public Module this->SetType(CORE); this->AddCommand(MEMOSERV, new CommandMSRSend()); - if (!MSMemoReceipt) + if (!Config.MSMemoReceipt) throw ModuleException("Don't like memo reciepts, or something."); ModuleManager::Attach(I_OnMemoServHelp, this); } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_RSEND); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_RSEND); } }; diff --git a/src/core/ms_send.c b/src/core/ms_send.c index 62429eac8..6fded396a 100644 --- a/src/core/ms_send.c +++ b/src/core/ms_send.c @@ -33,13 +33,13 @@ class CommandMSSend : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_MemoServ, u, MEMO_HELP_SEND); + notice_help(Config.s_MemoServ, u, MEMO_HELP_SEND); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_MemoServ, u, "SEND", MEMO_SEND_SYNTAX); + syntax_error(Config.s_MemoServ, u, "SEND", MEMO_SEND_SYNTAX); } }; @@ -57,7 +57,7 @@ class MSSend : public Module } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SEND); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_SEND); } }; diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c index c594be03f..dac721af8 100644 --- a/src/core/ms_sendall.c +++ b/src/core/ms_sendall.c @@ -30,7 +30,7 @@ class CommandMSSendAll : public Command if (readonly) { - notice_lang(s_MemoServ, u, MEMO_SEND_DISABLED); + notice_lang(Config.s_MemoServ, u, MEMO_SEND_DISABLED); return MOD_CONT; } @@ -43,19 +43,19 @@ class CommandMSSendAll : public Command } /* /nc */ } /* /i */ - notice_lang(s_MemoServ, u, MEMO_MASS_SENT); + notice_lang(Config.s_MemoServ, u, MEMO_MASS_SENT); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_MemoServ, u, MEMO_HELP_SENDALL); + notice_help(Config.s_MemoServ, u, MEMO_HELP_SENDALL); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_MemoServ, u, "SENDALL", MEMO_SEND_SYNTAX); + syntax_error(Config.s_MemoServ, u, "SENDALL", MEMO_SEND_SYNTAX); } }; @@ -73,7 +73,7 @@ class MSSendAll : public Module } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SENDALL); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_SENDALL); } }; diff --git a/src/core/ms_set.c b/src/core/ms_set.c index 3a7c396bf..dfa11bba4 100644 --- a/src/core/ms_set.c +++ b/src/core/ms_set.c @@ -26,44 +26,44 @@ class CommandMSSet : public Command { u->nc->SetFlag(NI_MEMO_SIGNON); u->nc->SetFlag(NI_MEMO_RECEIVE); - notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_ON, s_MemoServ); + notice_lang(Config.s_MemoServ, u, MEMO_SET_NOTIFY_ON, Config.s_MemoServ); } else if (param == "LOGON") { u->nc->SetFlag(NI_MEMO_SIGNON); u->nc->UnsetFlag(NI_MEMO_RECEIVE); - notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_LOGON, s_MemoServ); + notice_lang(Config.s_MemoServ, u, MEMO_SET_NOTIFY_LOGON, Config.s_MemoServ); } else if (param == "NEW") { u->nc->UnsetFlag(NI_MEMO_SIGNON); u->nc->SetFlag(NI_MEMO_RECEIVE); - notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_NEW, s_MemoServ); + notice_lang(Config.s_MemoServ, u, MEMO_SET_NOTIFY_NEW, Config.s_MemoServ); } else if (param == "MAIL") { if (u->nc->email) { u->nc->SetFlag(NI_MEMO_MAIL); - notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_MAIL); + notice_lang(Config.s_MemoServ, u, MEMO_SET_NOTIFY_MAIL); } else - notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_INVALIDMAIL); + notice_lang(Config.s_MemoServ, u, MEMO_SET_NOTIFY_INVALIDMAIL); } else if (param == "NOMAIL") { u->nc->UnsetFlag(NI_MEMO_MAIL); - notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_NOMAIL); + notice_lang(Config.s_MemoServ, u, MEMO_SET_NOTIFY_NOMAIL); } else if (param == "OFF") { u->nc->UnsetFlag(NI_MEMO_SIGNON); u->nc->UnsetFlag(NI_MEMO_RECEIVE); u->nc->UnsetFlag(NI_MEMO_MAIL); - notice_lang(s_MemoServ, u, MEMO_SET_NOTIFY_OFF, s_MemoServ); + notice_lang(Config.s_MemoServ, u, MEMO_SET_NOTIFY_OFF, Config.s_MemoServ); } else - syntax_error(s_MemoServ, u, "SET NOTIFY", MEMO_SET_NOTIFY_SYNTAX); + syntax_error(Config.s_MemoServ, u, "SET NOTIFY", MEMO_SET_NOTIFY_SYNTAX); return MOD_CONT; } @@ -86,12 +86,12 @@ class CommandMSSet : public Command p3 = params.size() > 4 ? params[4] : ""; if (!(ci = cs_findchan(chan.c_str()))) { - notice_lang(s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); + notice_lang(Config.s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); return MOD_CONT; } else if (!is_servadmin && !check_access(u, ci, CA_MEMO)) { - notice_lang(s_MemoServ, u, ACCESS_DENIED); + notice_lang(Config.s_MemoServ, u, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -103,7 +103,7 @@ class CommandMSSet : public Command NickAlias *na; if (!(na = findnick(p1.c_str()))) { - notice_lang(s_MemoServ, u, NICK_X_NOT_REGISTERED, p1.c_str()); + notice_lang(Config.s_MemoServ, u, NICK_X_NOT_REGISTERED, p1.c_str()); return MOD_CONT; } user = p1; @@ -114,12 +114,12 @@ class CommandMSSet : public Command } else if (p1.empty()) { - syntax_error(s_MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SERVADMIN_SYNTAX); + syntax_error(Config.s_MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SERVADMIN_SYNTAX); return MOD_CONT; } if ((!isdigit(p1[0]) && p1 != "NONE") || (!p2.empty() && p2 != "HARD")) { - syntax_error(s_MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SERVADMIN_SYNTAX); + syntax_error(Config.s_MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SERVADMIN_SYNTAX); return MOD_CONT; } if (!chan.empty()) @@ -139,7 +139,7 @@ class CommandMSSet : public Command limit = atoi(p1.c_str()); if (limit < 0 || limit > 32767) { - notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_OVERFLOW, 32767); + notice_lang(Config.s_MemoServ, u, MEMO_SET_LIMIT_OVERFLOW, 32767); limit = 32767; } if (p1 == "NONE") @@ -148,33 +148,33 @@ class CommandMSSet : public Command else { if (p1.empty() || !p2.empty() || !isdigit(p1[0])) { - syntax_error(s_MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SYNTAX); + syntax_error(Config.s_MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SYNTAX); return MOD_CONT; } if (!chan.empty() && (ci->HasFlag(CI_MEMO_HARDMAX))) { - notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_FORBIDDEN, chan.c_str()); + notice_lang(Config.s_MemoServ, u, MEMO_SET_LIMIT_FORBIDDEN, chan.c_str()); return MOD_CONT; } else if (chan.empty() && (nc->HasFlag(NI_MEMO_HARDMAX))) { - notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT_FORBIDDEN); + notice_lang(Config.s_MemoServ, u, MEMO_SET_YOUR_LIMIT_FORBIDDEN); return MOD_CONT; } limit = atoi(p1.c_str()); /* The first character is a digit, but we could still go negative * from overflow... watch out! */ - if (limit < 0 || (MSMaxMemos > 0 && limit > MSMaxMemos)) + if (limit < 0 || (Config.MSMaxMemos > 0 && limit > Config.MSMaxMemos)) { if (!chan.empty()) - notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_TOO_HIGH, chan.c_str(), MSMaxMemos); + notice_lang(Config.s_MemoServ, u, MEMO_SET_LIMIT_TOO_HIGH, chan.c_str(), Config.MSMaxMemos); else - notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT_TOO_HIGH, MSMaxMemos); + notice_lang(Config.s_MemoServ, u, MEMO_SET_YOUR_LIMIT_TOO_HIGH, Config.MSMaxMemos); return MOD_CONT; } else if (limit > 32767) { - notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_OVERFLOW, 32767); + notice_lang(Config.s_MemoServ, u, MEMO_SET_LIMIT_OVERFLOW, 32767); limit = 32767; } } @@ -182,23 +182,23 @@ class CommandMSSet : public Command if (limit > 0) { if (chan.empty() && nc == u->nc) - notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT, limit); + notice_lang(Config.s_MemoServ, u, MEMO_SET_YOUR_LIMIT, limit); else - notice_lang(s_MemoServ, u, MEMO_SET_LIMIT, !chan.empty() ? chan.c_str() : user.c_str(), limit); + notice_lang(Config.s_MemoServ, u, MEMO_SET_LIMIT, !chan.empty() ? chan.c_str() : user.c_str(), limit); } else if (!limit) { if (chan.empty() && nc == u->nc) - notice_lang(s_MemoServ, u, MEMO_SET_YOUR_LIMIT_ZERO); + notice_lang(Config.s_MemoServ, u, MEMO_SET_YOUR_LIMIT_ZERO); else - notice_lang(s_MemoServ, u, MEMO_SET_LIMIT_ZERO, !chan.empty() ? chan.c_str() : user.c_str()); + notice_lang(Config.s_MemoServ, u, MEMO_SET_LIMIT_ZERO, !chan.empty() ? chan.c_str() : user.c_str()); } else { if (chan.empty() && nc == u->nc) - notice_lang(s_MemoServ, u, MEMO_UNSET_YOUR_LIMIT); + notice_lang(Config.s_MemoServ, u, MEMO_UNSET_YOUR_LIMIT); else - notice_lang(s_MemoServ, u, MEMO_UNSET_LIMIT, !chan.empty() ? chan.c_str() : user.c_str()); + notice_lang(Config.s_MemoServ, u, MEMO_UNSET_LIMIT, !chan.empty() ? chan.c_str() : user.c_str()); } return MOD_CONT; } @@ -214,7 +214,7 @@ class CommandMSSet : public Command if (readonly) { - notice_lang(s_MemoServ, u, MEMO_SET_DISABLED); + notice_lang(Config.s_MemoServ, u, MEMO_SET_DISABLED); return MOD_CONT; } else if (cmd == "NOTIFY") @@ -223,8 +223,8 @@ class CommandMSSet : public Command return this->DoLimit(u, params, mi); else { - notice_lang(s_MemoServ, u, MEMO_SET_UNKNOWN_OPTION, cmd.c_str()); - notice_lang(s_MemoServ, u, MORE_INFO, s_MemoServ, "SET"); + notice_lang(Config.s_MemoServ, u, MEMO_SET_UNKNOWN_OPTION, cmd.c_str()); + notice_lang(Config.s_MemoServ, u, MORE_INFO, Config.s_MemoServ, "SET"); } return MOD_CONT; } @@ -232,15 +232,15 @@ class CommandMSSet : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (subcommand.empty()) - notice_help(s_MemoServ, u, MEMO_HELP_SET); + notice_help(Config.s_MemoServ, u, MEMO_HELP_SET); else if (subcommand == "NOTIFY") - notice_help(s_MemoServ, u, MEMO_HELP_SET_NOTIFY); + notice_help(Config.s_MemoServ, u, MEMO_HELP_SET_NOTIFY); else if (subcommand == "LIMIT") { if (u->nc && u->nc->IsServicesOper()) - notice_help(s_MemoServ, u, MEMO_SERVADMIN_HELP_SET_LIMIT, MSMaxMemos); + notice_help(Config.s_MemoServ, u, MEMO_SERVADMIN_HELP_SET_LIMIT, Config.MSMaxMemos); else - notice_help(s_MemoServ, u, MEMO_HELP_SET_LIMIT, MSMaxMemos); + notice_help(Config.s_MemoServ, u, MEMO_HELP_SET_LIMIT, Config.MSMaxMemos); } else return false; @@ -250,7 +250,7 @@ class CommandMSSet : public Command void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_MemoServ, u, "SET", MEMO_SET_SYNTAX); + syntax_error(Config.s_MemoServ, u, "SET", MEMO_SET_SYNTAX); } }; @@ -269,7 +269,7 @@ class MSSet : public Module } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SET); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_SET); } }; diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c index 520c14df0..d46cd7438 100644 --- a/src/core/ms_staff.c +++ b/src/core/ms_staff.c @@ -30,7 +30,7 @@ class CommandMSStaff : public Command if (readonly) { - notice_lang(s_MemoServ, u, MEMO_SEND_DISABLED); + notice_lang(Config.s_MemoServ, u, MEMO_SEND_DISABLED); return MOD_CONT; } @@ -47,13 +47,13 @@ class CommandMSStaff : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_MemoServ, u, MEMO_HELP_STAFF); + notice_help(Config.s_MemoServ, u, MEMO_HELP_STAFF); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_MemoServ, u, "STAFF", MEMO_STAFF_SYNTAX); + syntax_error(Config.s_MemoServ, u, "STAFF", MEMO_STAFF_SYNTAX); } }; @@ -71,7 +71,7 @@ class MSStaff : public Module } void OnMemoServHelp(User *u) { - notice_lang(s_MemoServ, u, MEMO_HELP_CMD_STAFF); + notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_STAFF); } }; diff --git a/src/core/ns_access.c b/src/core/ns_access.c index 8aa40d546..636fb5b2f 100644 --- a/src/core/ns_access.c +++ b/src/core/ns_access.c @@ -25,31 +25,31 @@ class CommandNSAccess : public Command if (nc->access.empty()) { - notice_lang(s_NickServ, u, NICK_ACCESS_LIST_X_EMPTY, nc->display); + notice_lang(Config.s_NickServ, u, NICK_ACCESS_LIST_X_EMPTY, nc->display); return MOD_CONT; } /* reinstate when forbidden is moved to a group flag if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); return MOD_CONT; } */ if (nc->HasFlag(NI_SUSPENDED)) { - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, nc->display); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, nc->display); return MOD_CONT; } - notice_lang(s_NickServ, u, NICK_ACCESS_LIST_X, params[1].c_str()); + notice_lang(Config.s_NickServ, u, NICK_ACCESS_LIST_X, params[1].c_str()); for (i = 0; i < nc->access.size(); ++i) { std::string access = nc->GetAccess(i); if (mask && !Anope::Match(access, mask, true)) continue; - u->SendMessage(s_NickServ, " %s", access.c_str()); + u->SendMessage(Config.s_NickServ, " %s", access.c_str()); } return MOD_CONT; @@ -63,20 +63,20 @@ class CommandNSAccess : public Command return MOD_CONT; } - if (nc->access.size() >= NSAccessMax) + if (nc->access.size() >= Config.NSAccessMax) { - notice_lang(s_NickServ, u, NICK_ACCESS_REACHED_LIMIT, NSAccessMax); + notice_lang(Config.s_NickServ, u, NICK_ACCESS_REACHED_LIMIT, Config.NSAccessMax); return MOD_CONT; } if (nc->FindAccess(mask)) { - notice_lang(s_NickServ, u, NICK_ACCESS_ALREADY_PRESENT, *access); + notice_lang(Config.s_NickServ, u, NICK_ACCESS_ALREADY_PRESENT, *access); return MOD_CONT; } nc->AddAccess(mask); - notice_lang(s_NickServ, u, NICK_ACCESS_ADDED, mask); + notice_lang(Config.s_NickServ, u, NICK_ACCESS_ADDED, mask); return MOD_CONT; } @@ -91,11 +91,11 @@ class CommandNSAccess : public Command if (!nc->FindAccess(mask)) { - notice_lang(s_NickServ, u, NICK_ACCESS_NOT_FOUND, mask); + notice_lang(Config.s_NickServ, u, NICK_ACCESS_NOT_FOUND, mask); return MOD_CONT; } - notice_lang(s_NickServ, u, NICK_ACCESS_DELETED, mask); + notice_lang(Config.s_NickServ, u, NICK_ACCESS_DELETED, mask); nc->EraseAccess(mask); return MOD_CONT; @@ -107,17 +107,17 @@ class CommandNSAccess : public Command if (nc->access.empty()) { - notice_lang(s_NickServ, u, NICK_ACCESS_LIST_EMPTY, u->nick); + notice_lang(Config.s_NickServ, u, NICK_ACCESS_LIST_EMPTY, u->nick); return MOD_CONT; } - notice_lang(s_NickServ, u, NICK_ACCESS_LIST); + notice_lang(Config.s_NickServ, u, NICK_ACCESS_LIST); for (i = 0; i < nc->access.size(); ++i) { std::string access = nc->GetAccess(i); if (mask && !Anope::Match(access, mask, true)) continue; - u->SendMessage(s_NickServ, " %s", access.c_str()); + u->SendMessage(Config.s_NickServ, " %s", access.c_str()); } return MOD_CONT; @@ -138,16 +138,16 @@ class CommandNSAccess : public Command if (mask && !strchr(mask, '@')) { - notice_lang(s_NickServ, u, BAD_USERHOST_MASK); - notice_lang(s_NickServ, u, MORE_INFO, s_NickServ, "ACCESS"); + notice_lang(Config.s_NickServ, u, BAD_USERHOST_MASK); + notice_lang(Config.s_NickServ, u, MORE_INFO, Config.s_NickServ, "ACCESS"); } /* else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); */ else if (u->nc->HasFlag(NI_SUSPENDED)) - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, u->nc->display); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, u->nc->display); else if (cmd == "ADD") return this->DoAdd(u, u->nc, mask); else if (cmd == "DEL") @@ -161,13 +161,13 @@ class CommandNSAccess : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_HELP_ACCESS); + notice_help(Config.s_NickServ, u, NICK_HELP_ACCESS); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "ACCESS", NICK_ACCESS_SYNTAX); + syntax_error(Config.s_NickServ, u, "ACCESS", NICK_ACCESS_SYNTAX); } }; @@ -186,7 +186,7 @@ class NSAccess : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_ACCESS); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_ACCESS); } }; diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c index 6ecc3201f..e56eb4c06 100644 --- a/src/core/ns_alist.c +++ b/src/core/ns_alist.c @@ -82,11 +82,11 @@ class CommandNSAList : public Command } if (!na) - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); else if (min_level <= ACCESS_INVALID || min_level > ACCESS_FOUNDER) - notice_lang(s_NickServ, u, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); + notice_lang(Config.s_NickServ, u, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); else { int i, level; @@ -94,7 +94,7 @@ class CommandNSAList : public Command int match_count = 0; ChannelInfo *ci; - notice_lang(s_NickServ, u, is_servadmin ? NICK_ALIST_HEADER_X : NICK_ALIST_HEADER, na->nick); + notice_lang(Config.s_NickServ, u, is_servadmin ? NICK_ALIST_HEADER_X : NICK_ALIST_HEADER, na->nick); for (i = 0; i < 256; ++i) { @@ -115,15 +115,15 @@ class CommandNSAList : public Command xop = get_xop_level(level); - notice_lang(s_NickServ, u, NICK_ALIST_XOP_FORMAT, match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name, xop, ci->desc ? ci->desc : ""); + notice_lang(Config.s_NickServ, u, NICK_ALIST_XOP_FORMAT, match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name, xop, ci->desc ? ci->desc : ""); } else - notice_lang(s_NickServ, u, NICK_ALIST_ACCESS_FORMAT, match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name, level, ci->desc ? ci->desc : ""); + notice_lang(Config.s_NickServ, u, NICK_ALIST_ACCESS_FORMAT, match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name, level, ci->desc ? ci->desc : ""); } } } - notice_lang(s_NickServ, u, NICK_ALIST_FOOTER, match_count, chan_count); + notice_lang(Config.s_NickServ, u, NICK_ALIST_FOOTER, match_count, chan_count); } return MOD_CONT; } @@ -131,9 +131,9 @@ class CommandNSAList : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (u->nc && u->nc->IsServicesOper()) - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_ALIST); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_ALIST); else - notice_help(s_NickServ, u, NICK_HELP_ALIST); + notice_help(Config.s_NickServ, u, NICK_HELP_ALIST); return true; } @@ -154,7 +154,7 @@ class NSAList : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_ALIST); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_ALIST); } }; diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c index 275820826..096fb09af 100644 --- a/src/core/ns_drop.c +++ b/src/core/ns_drop.c @@ -32,7 +32,7 @@ class CommandNSDrop : public Command if (readonly) { - notice_lang(s_NickServ, u, NICK_DROP_DISABLED); + notice_lang(Config.s_NickServ, u, NICK_DROP_DISABLED); return MOD_CONT; } @@ -42,17 +42,17 @@ class CommandNSDrop : public Command { if ((nr = findrequestnick(nick)) && u->nc->IsServicesOper()) { - if (WallDrop) - ircdproto->SendGlobops(s_NickServ, "\2%s\2 used DROP on \2%s\2", u->nick, nick); - alog("%s: %s!%s@%s dropped nickname %s (e-mail: %s)", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nr->nick, nr->email); + if (Config.WallDrop) + ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used DROP on \2%s\2", u->nick, nick); + alog("%s: %s!%s@%s dropped nickname %s (e-mail: %s)", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nr->nick, nr->email); delete nr; - notice_lang(s_NickServ, u, NICK_X_DROPPED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_DROPPED, nick); } else - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); } else - notice_lang(s_NickServ, u, NICK_NOT_REGISTERED); + notice_lang(Config.s_NickServ, u, NICK_NOT_REGISTERED); return MOD_CONT; } @@ -61,34 +61,34 @@ class CommandNSDrop : public Command my_nick = sstrdup(na->nick); if (!is_mine && !u->nc->HasPriv("nickserv/drop")) - notice_lang(s_NickServ, u, ACCESS_DENIED); - else if (NSSecureAdmins && !is_mine && na->nc->IsServicesOper()) - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); + else if (Config.NSSecureAdmins && !is_mine && na->nc->IsServicesOper()) + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); else { if (readonly) - notice_lang(s_NickServ, u, READ_ONLY_MODE); + notice_lang(Config.s_NickServ, u, READ_ONLY_MODE); if (ircd->sqline && (na->HasFlag(NS_FORBIDDEN))) ircdproto->SendSQLineDel(na->nick); - alog("%s: %s!%s@%s dropped nickname %s (group %s) (e-mail: %s)", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, na->nick, na->nc->display, na->nc->email ? na->nc->email : "none"); + alog("%s: %s!%s@%s dropped nickname %s (group %s) (e-mail: %s)", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, na->nick, na->nc->display, na->nc->email ? na->nc->email : "none"); delete na; FOREACH_MOD(I_OnNickDrop, OnNickDrop(my_nick ? my_nick : nick)); if (!is_mine) { - if (WallDrop) - ircdproto->SendGlobops(s_NickServ, "\2%s\2 used DROP on \2%s\2", u->nick, nick); - notice_lang(s_NickServ, u, NICK_X_DROPPED, nick); + if (Config.WallDrop) + ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used DROP on \2%s\2", u->nick, nick); + notice_lang(Config.s_NickServ, u, NICK_X_DROPPED, nick); } else { if (nick) - notice_lang(s_NickServ, u, NICK_X_DROPPED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_DROPPED, nick); else - notice_lang(s_NickServ, u, NICK_DROPPED); + notice_lang(Config.s_NickServ, u, NICK_DROPPED); if (my_nick) delete [] my_nick; } @@ -99,9 +99,9 @@ class CommandNSDrop : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (u->nc && u->nc->HasPriv("nickserv/drop")) - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_DROP); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_DROP); else - notice_help(s_NickServ, u, NICK_HELP_DROP); + notice_help(Config.s_NickServ, u, NICK_HELP_DROP); return true; } @@ -122,7 +122,7 @@ class NSDrop : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_DROP); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_DROP); } }; diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c index 16f3bda6f..68deea161 100644 --- a/src/core/ns_forbid.c +++ b/src/core/ns_forbid.c @@ -29,23 +29,23 @@ class CommandNSForbid : public Command const char *reason = params.size() > 1 ? params[1].c_str() : NULL; /* Assumes that permission checking has already been done. */ - if (ForceForbidReason && !reason) { + if (Config.ForceForbidReason && !reason) { this->OnSyntaxError(u, ""); return MOD_CONT; } if (readonly) - notice_lang(s_NickServ, u, READ_ONLY_MODE); + notice_lang(Config.s_NickServ, u, READ_ONLY_MODE); if (!ircdproto->IsNickValid(nick)) { - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, nick); return MOD_CONT; } if ((na = findnick(nick))) { - if (NSSecureAdmins && na->nc->IsServicesOper()) + if (Config.NSSecureAdmins && na->nc->IsServicesOper()) { - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } delete na; @@ -62,7 +62,7 @@ class CommandNSForbid : public Command if (curr) { - notice_lang(s_NickServ, curr, FORCENICKCHANGE_NOW); + notice_lang(Config.s_NickServ, curr, FORCENICKCHANGE_NOW); collide(na, 0); } @@ -70,31 +70,31 @@ class CommandNSForbid : public Command if (ircd->sqline) ircdproto->SendSQLine(na->nick, reason ? reason : "Forbidden"); - if (WallForbid) - ircdproto->SendGlobops(s_NickServ, "\2%s\2 used FORBID on \2%s\2", u->nick, nick); + if (Config.WallForbid) + ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used FORBID on \2%s\2", u->nick, nick); - alog("%s: %s set FORBID for nick %s", s_NickServ, u->nick, nick); - notice_lang(s_NickServ, u, NICK_FORBID_SUCCEEDED, nick); + alog("%s: %s set FORBID for nick %s", Config.s_NickServ, u->nick, nick); + notice_lang(Config.s_NickServ, u, NICK_FORBID_SUCCEEDED, nick); FOREACH_MOD(I_OnNickForbidden, OnNickForbidden(na)); } else { - alog("%s: Valid FORBID for %s by %s failed", s_NickServ, nick, u->nick); - notice_lang(s_NickServ, u, NICK_FORBID_FAILED, nick); + alog("%s: Valid FORBID for %s by %s failed", Config.s_NickServ, nick, u->nick); + notice_lang(Config.s_NickServ, u, NICK_FORBID_FAILED, nick); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_FORBID); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_FORBID); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "FORBID", ForceForbidReason ? NICK_FORBID_SYNTAX_REASON : NICK_FORBID_SYNTAX); + syntax_error(Config.s_NickServ, u, "FORBID", Config.ForceForbidReason ? NICK_FORBID_SYNTAX_REASON : NICK_FORBID_SYNTAX); } }; @@ -113,7 +113,7 @@ class NSForbid : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_FORBID); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_FORBID); } }; diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c index 1c1ea750a..d45d35950 100644 --- a/src/core/ns_getemail.c +++ b/src/core/ns_getemail.c @@ -33,7 +33,7 @@ class CommandNSGetEMail : public Command int i, j = 0; NickCore *nc; - alog("%s: %s!%s@%s used GETEMAIL on %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, email.c_str()); + alog("%s: %s!%s@%s used GETEMAIL on %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, email.c_str()); for (i = 0; i < 1024; ++i) { for (nc = nclists[i]; nc; nc = nc->next) @@ -43,14 +43,14 @@ class CommandNSGetEMail : public Command if (nc->email == email) { ++j; - notice_lang(s_NickServ, u, NICK_GETEMAIL_EMAILS_ARE, nc->display, email.c_str()); + notice_lang(Config.s_NickServ, u, NICK_GETEMAIL_EMAILS_ARE, nc->display, email.c_str()); } } } } if (j <= 0) { - notice_lang(s_NickServ, u, NICK_GETEMAIL_NOT_USED, email.c_str()); + notice_lang(Config.s_NickServ, u, NICK_GETEMAIL_NOT_USED, email.c_str()); return MOD_CONT; } return MOD_CONT; @@ -58,13 +58,13 @@ class CommandNSGetEMail : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GETEMAIL); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_GETEMAIL); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "GETMAIL", NICK_GETEMAIL_SYNTAX); + syntax_error(Config.s_NickServ, u, "GETMAIL", NICK_GETEMAIL_SYNTAX); } }; @@ -83,7 +83,7 @@ class NSGetEMail : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_GETEMAIL); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_GETEMAIL); } }; diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c index 4baa1224e..ac52ccac9 100644 --- a/src/core/ns_getpass.c +++ b/src/core/ns_getpass.c @@ -33,42 +33,42 @@ class CommandNSGetPass : public Command { if ((nr = findrequestnick(nick))) { - alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nick); - if (WallGetpass) - ircdproto->SendGlobops(s_NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick, nick); - notice_lang(s_NickServ, u, NICK_GETPASS_PASSCODE_IS, nick, nr->passcode); + alog("%s: %s!%s@%s used GETPASS on %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nick); + if (Config.WallGetpass) + ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick, nick); + notice_lang(Config.s_NickServ, u, NICK_GETPASS_PASSCODE_IS, nick, nr->passcode); } else - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); } else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); - else if (NSSecureAdmins && na->nc->IsServicesOper()) - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + else if (Config.NSSecureAdmins && na->nc->IsServicesOper()) + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); else { if (enc_decrypt(na->nc->pass, tmp_pass, PASSMAX - 1) == 1) { - alog("%s: %s!%s@%s used GETPASS on %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nick); - if (WallGetpass) - ircdproto->SendGlobops(s_NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick, nick); - notice_lang(s_NickServ, u, NICK_GETPASS_PASSWORD_IS, nick, tmp_pass); + alog("%s: %s!%s@%s used GETPASS on %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nick); + if (Config.WallGetpass) + ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick, nick); + notice_lang(Config.s_NickServ, u, NICK_GETPASS_PASSWORD_IS, nick, tmp_pass); } else - notice_lang(s_NickServ, u, NICK_GETPASS_UNAVAILABLE); + notice_lang(Config.s_NickServ, u, NICK_GETPASS_UNAVAILABLE); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GETPASS); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_GETPASS); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "GETPASS", NICK_GETPASS_SYNTAX); + syntax_error(Config.s_NickServ, u, "GETPASS", NICK_GETPASS_SYNTAX); } }; @@ -91,7 +91,7 @@ class NSGetPass : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_GETPASS); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_GETPASS); } }; diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c index a7e81c334..35b56b57e 100644 --- a/src/core/ns_ghost.c +++ b/src/core/ns_ghost.c @@ -30,15 +30,15 @@ class CommandNSGhost : public Command NickAlias *na = findnick(nick); if (!finduser(nick)) - notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_IN_USE, nick); else if (!na) - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); else if (na->nc->HasFlag(NI_SUSPENDED)) - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, na->nick); else if (!stricmp(nick, u->nick)) - notice_lang(s_NickServ, u, NICK_NO_GHOST_SELF); + notice_lang(Config.s_NickServ, u, NICK_NO_GHOST_SELF); else if (pass) { int res = enc_check_password(pass, na->nc->pass); @@ -46,15 +46,15 @@ class CommandNSGhost : public Command { char buf[NICKMAX + 32]; snprintf(buf, sizeof(buf), "GHOST command used by %s", u->nick); - kill_user(s_NickServ, nick, buf); - notice_lang(s_NickServ, u, NICK_GHOST_KILLED, nick); + kill_user(Config.s_NickServ, nick, buf); + notice_lang(Config.s_NickServ, u, NICK_GHOST_KILLED, nick); } else { - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); if (!res) { - alog("%s: GHOST: invalid password for %s by %s!%s@%s", s_NickServ, nick, u->nick, u->GetIdent().c_str(), u->host); + alog("%s: GHOST: invalid password for %s by %s!%s@%s", Config.s_NickServ, nick, u->nick, u->GetIdent().c_str(), u->host); bad_password(u); } } @@ -65,24 +65,24 @@ class CommandNSGhost : public Command { char buf[NICKMAX + 32]; snprintf(buf, sizeof(buf), "GHOST command used by %s", u->nick); - kill_user(s_NickServ, nick, buf); - notice_lang(s_NickServ, u, NICK_GHOST_KILLED, nick); + kill_user(Config.s_NickServ, nick, buf); + notice_lang(Config.s_NickServ, u, NICK_GHOST_KILLED, nick); } else - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_HELP_GHOST); + notice_help(Config.s_NickServ, u, NICK_HELP_GHOST); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "GHOST", NICK_GHOST_SYNTAX); + syntax_error(Config.s_NickServ, u, "GHOST", NICK_GHOST_SYNTAX); } }; @@ -101,7 +101,7 @@ class NSGhost : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_GHOST); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_GHOST); } }; diff --git a/src/core/ns_group.c b/src/core/ns_group.c index 231f7cc2a..435e6907b 100644 --- a/src/core/ns_group.c +++ b/src/core/ns_group.c @@ -30,33 +30,33 @@ class CommandNSGroup : public Command const char *pass = params[1].c_str(); std::list<std::pair<std::string, std::string> >::iterator it; - if (NSEmailReg && findrequestnick(u->nick)) + if (Config.NSEmailReg && findrequestnick(u->nick)) { - notice_lang(s_NickServ, u, NICK_REQUESTED); + notice_lang(Config.s_NickServ, u, NICK_REQUESTED); return MOD_CONT; } if (readonly) { - notice_lang(s_NickServ, u, NICK_GROUP_DISABLED); + notice_lang(Config.s_NickServ, u, NICK_GROUP_DISABLED); return MOD_CONT; } if (!ircdproto->IsNickValid(u->nick)) { - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, u->nick); return MOD_CONT; } - if (RestrictOperNicks) + if (Config.RestrictOperNicks) { - for (it = svsopers_in_config.begin(); it != svsopers_in_config.end(); ++it) + for (it = Config.Opers.begin(); it != Config.Opers.end(); ++it) { std::string nick = it->first; if (stristr(u->nick, nick.c_str()) && !is_oper(u)) { - notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); + notice_lang(Config.s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); return MOD_CONT; } } @@ -64,31 +64,31 @@ class CommandNSGroup : public Command na = findnick(u->nick); if (!(target = findnick(nick))) - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); - else if (time(NULL) < u->lastnickreg + NSRegDelay) - notice_lang(s_NickServ, u, NICK_GROUP_PLEASE_WAIT, (NSRegDelay + u->lastnickreg) - time(NULL)); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + else if (time(NULL) < u->lastnickreg + Config.NSRegDelay) + notice_lang(Config.s_NickServ, u, NICK_GROUP_PLEASE_WAIT, (Config.NSRegDelay + u->lastnickreg) - time(NULL)); else if (u->nc && u->nc->HasFlag(NI_SUSPENDED)) { - alog("%s: %s!%s@%s tried to use GROUP from SUSPENDED nick %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, target->nick); - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, u->nick); + alog("%s: %s!%s@%s tried to use GROUP from SUSPENDED nick %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, target->nick); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, u->nick); } else if (target && target->nc->HasFlag(NI_SUSPENDED)) { - alog("%s: %s!%s@%s tried to use GROUP from SUSPENDED nick %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, target->nick); - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, target->nick); + alog("%s: %s!%s@%s tried to use GROUP from SUSPENDED nick %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, target->nick); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, target->nick); } else if (target->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, nick); else if (na && target->nc == na->nc) - notice_lang(s_NickServ, u, NICK_GROUP_SAME, target->nick); + notice_lang(Config.s_NickServ, u, NICK_GROUP_SAME, target->nick); else if (na && na->nc != u->nc) - notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ); - else if (NSMaxAliases && (target->nc->aliases.count >= NSMaxAliases) && !target->nc->IsServicesOper()) - notice_lang(s_NickServ, u, NICK_GROUP_TOO_MANY, target->nick, s_NickServ, s_NickServ); + notice_lang(Config.s_NickServ, u, NICK_IDENTIFY_REQUIRED, Config.s_NickServ); + else if (Config.NSMaxAliases && (target->nc->aliases.count >= Config.NSMaxAliases) && !target->nc->IsServicesOper()) + notice_lang(Config.s_NickServ, u, NICK_GROUP_TOO_MANY, target->nick, Config.s_NickServ, Config.s_NickServ); else if (enc_check_password(pass, target->nc->pass) != 1) { - alog("%s: Failed GROUP for %s!%s@%s (invalid password)", s_NickServ, u->nick, u->GetIdent().c_str(), u->host); - notice_lang(s_NickServ, u, PASSWORD_INCORRECT); + alog("%s: Failed GROUP for %s!%s@%s (invalid password)", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host); + notice_lang(Config.s_NickServ, u, PASSWORD_INCORRECT); bad_password(u); } else @@ -100,12 +100,12 @@ class CommandNSGroup : public Command delete na; else { - int prefixlen = strlen(NSGuestNickPrefix); + int prefixlen = strlen(Config.NSGuestNickPrefix); int nicklen = strlen(u->nick); - if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && stristr(u->nick, NSGuestNickPrefix) == u->nick && strspn(u->nick + prefixlen, "1234567890") == nicklen - prefixlen) + if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && stristr(u->nick, Config.NSGuestNickPrefix) == u->nick && strspn(u->nick + prefixlen, "1234567890") == nicklen - prefixlen) { - notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); + notice_lang(Config.s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); return MOD_CONT; } } @@ -124,8 +124,8 @@ class CommandNSGroup : public Command FOREACH_MOD(I_OnNickGroup, OnNickGroup(u, target)); ircdproto->SetAutoIdentificationToken(u); - alog("%s: %s!%s@%s makes %s join group of %s (%s) (e-mail: %s)", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, u->nick, target->nick, target->nc->display, (target->nc->email ? target->nc->email : "none")); - notice_lang(s_NickServ, u, NICK_GROUP_JOINED, target->nick); + alog("%s: %s!%s@%s makes %s join group of %s (%s) (e-mail: %s)", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, u->nick, target->nick, target->nc->display, (target->nc->email ? target->nc->email : "none")); + notice_lang(Config.s_NickServ, u, NICK_GROUP_JOINED, target->nick); u->lastnickreg = time(NULL); @@ -133,8 +133,8 @@ class CommandNSGroup : public Command } else { - alog("%s: makealias(%s) failed", s_NickServ, u->nick); - notice_lang(s_NickServ, u, NICK_GROUP_FAILED); + alog("%s: makealias(%s) failed", Config.s_NickServ, u->nick); + notice_lang(Config.s_NickServ, u, NICK_GROUP_FAILED); } } return MOD_CONT; @@ -142,13 +142,13 @@ class CommandNSGroup : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_HELP_GROUP); + notice_help(Config.s_NickServ, u, NICK_HELP_GROUP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "GROUP", NICK_GROUP_SYNTAX); + syntax_error(Config.s_NickServ, u, "GROUP", NICK_GROUP_SYNTAX); } }; @@ -167,11 +167,11 @@ class CommandNSGList : public Command int i; if (nick && (stricmp(nick, u->nick) && !u->nc->IsServicesOper())) - notice_lang(s_NickServ, u, ACCESS_DENIED, s_NickServ); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED, Config.s_NickServ); else if (nick && (!findnick(nick) || !(nc = findnick(nick)->nc))) - notice_lang(s_NickServ, u, !nick ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, !nick ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nick); /* else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);*/ + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick);*/ else { time_t expt; @@ -179,7 +179,7 @@ class CommandNSGList : public Command char buf[BUFSIZE]; int wont_expire; - notice_lang(s_NickServ, u, nick ? NICK_GLIST_HEADER_X : NICK_GLIST_HEADER, nc->display); + notice_lang(Config.s_NickServ, u, nick ? NICK_GLIST_HEADER_X : NICK_GLIST_HEADER, nc->display); for (i = 0; i < nc->aliases.count; ++i) { NickAlias *na2 = static_cast<NickAlias *>(nc->aliases.list[i]); @@ -187,14 +187,14 @@ class CommandNSGList : public Command { if (!(wont_expire = na2->HasFlag(NS_NO_EXPIRE))) { - expt = na2->last_seen + NSExpire; + expt = na2->last_seen + Config.NSExpire; tm = localtime(&expt); strftime_lang(buf, sizeof(buf), finduser(na2->nick), STRFTIME_DATE_TIME_FORMAT, tm); } - notice_lang(s_NickServ, u, u->nc->IsServicesOper() && !wont_expire ? NICK_GLIST_REPLY_ADMIN : NICK_GLIST_REPLY, wont_expire ? '!' : ' ', na2->nick, buf); + notice_lang(Config.s_NickServ, u, u->nc->IsServicesOper() && !wont_expire ? NICK_GLIST_REPLY_ADMIN : NICK_GLIST_REPLY, wont_expire ? '!' : ' ', na2->nick, buf); } } - notice_lang(s_NickServ, u, NICK_GLIST_FOOTER, nc->aliases.count); + notice_lang(Config.s_NickServ, u, NICK_GLIST_FOOTER, nc->aliases.count); } return MOD_CONT; } @@ -203,9 +203,9 @@ class CommandNSGList : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (u->nc && u->nc->IsServicesOper()) - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GLIST); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_GLIST); else - notice_help(s_NickServ, u, NICK_HELP_GLIST); + notice_help(Config.s_NickServ, u, NICK_HELP_GLIST); return true; } @@ -227,8 +227,8 @@ class NSGroup : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_GROUP); - notice_lang(s_NickServ, u, NICK_HELP_CMD_GLIST); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_GROUP); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_GLIST); } }; diff --git a/src/core/ns_help.c b/src/core/ns_help.c index 9b1bdfe5c..1835335a4 100644 --- a/src/core/ns_help.c +++ b/src/core/ns_help.c @@ -30,25 +30,25 @@ class CommandNSHelp : public Command if (cmd == "SET LANGUAGE") { int i; - notice_help(s_NickServ, u, NICK_HELP_SET_LANGUAGE); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_LANGUAGE); for (i = 0; i < NUM_LANGS && langlist[i] >= 0; ++i) - u->SendMessage(s_NickServ, " %2d) %s", i + 1, langnames[langlist[i]]); + u->SendMessage(Config.s_NickServ, " %2d) %s", i + 1, langnames[langlist[i]]); } else - mod_help_cmd(s_NickServ, u, NICKSERV, cmd.c_str()); + mod_help_cmd(Config.s_NickServ, u, NICKSERV, cmd.c_str()); return MOD_CONT; } void OnSyntaxError(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_HELP); + notice_help(Config.s_NickServ, u, NICK_HELP); FOREACH_MOD(I_OnNickServHelp, OnNickServHelp(u)); if (u->nc && u->nc->IsServicesOper()) - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP); - if (NSExpire >= 86400) - notice_help(s_NickServ, u, NICK_HELP_EXPIRES, NSExpire / 86400); - notice_help(s_NickServ, u, NICK_HELP_FOOTER); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP); + if (Config.NSExpire >= 86400) + notice_help(Config.s_NickServ, u, NICK_HELP_EXPIRES, Config.NSExpire / 86400); + notice_help(Config.s_NickServ, u, NICK_HELP_FOOTER); } }; diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c index 0d262d54b..af111689c 100644 --- a/src/core/ns_identify.c +++ b/src/core/ns_identify.c @@ -36,33 +36,33 @@ class CommandNSIdentify : public Command if (!(na = findnick(u->nick))) { if ((nr = findrequestnick(u->nick))) - notice_lang(s_NickServ, u, NICK_IS_PREREG); + notice_lang(Config.s_NickServ, u, NICK_IS_PREREG); else - notice_lang(s_NickServ, u, NICK_NOT_REGISTERED); + notice_lang(Config.s_NickServ, u, NICK_NOT_REGISTERED); } else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); else if (na->nc->HasFlag(NI_SUSPENDED)) - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, na->nick); /* You can now identify for other nicks without logging out first, * however you can not identify again for the group you're already * identified as */ else if (u->nc && u->nc == na->nc) - notice_lang(s_NickServ, u, NICK_ALREADY_IDENTIFIED); + notice_lang(Config.s_NickServ, u, NICK_ALREADY_IDENTIFIED); else if (!(res = enc_check_password(pass, na->nc->pass))) { - alog("%s: Failed IDENTIFY for %s!%s@%s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host); - notice_lang(s_NickServ, u, PASSWORD_INCORRECT); + alog("%s: Failed IDENTIFY for %s!%s@%s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host); + notice_lang(Config.s_NickServ, u, PASSWORD_INCORRECT); bad_password(u); } else if (res == -1) - notice_lang(s_NickServ, u, NICK_IDENTIFY_FAILED); + notice_lang(Config.s_NickServ, u, NICK_IDENTIFY_FAILED); else { if (nick_identified(u)) { - alog("%s: %s!%s@%s logged out of account %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, u->nc->display); + alog("%s: %s!%s@%s logged out of account %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, u->nc->display); } u->UpdateHost(); @@ -77,17 +77,17 @@ class CommandNSIdentify : public Command FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u)); - alog("%s: %s!%s@%s identified for nick %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, u->nick); - notice_lang(s_NickServ, u, NICK_IDENTIFY_SUCCEEDED); + alog("%s: %s!%s@%s identified for nick %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, u->nick); + notice_lang(Config.s_NickServ, u, NICK_IDENTIFY_SUCCEEDED); if (ircd->vhost) do_on_id(u); - if (NSModeOnID) + if (Config.NSModeOnID) do_setmodes(u); - if (NSForceEmail && u->nc && !u->nc->email) + if (Config.NSForceEmail && u->nc && !u->nc->email) { - notice_lang(s_NickServ, u, NICK_IDENTIFY_EMAIL_REQUIRED); - notice_help(s_NickServ, u, NICK_IDENTIFY_EMAIL_HOWTO); + notice_lang(Config.s_NickServ, u, NICK_IDENTIFY_EMAIL_REQUIRED); + notice_help(Config.s_NickServ, u, NICK_IDENTIFY_EMAIL_HOWTO); } if (nick_identified(u)) @@ -102,13 +102,13 @@ class CommandNSIdentify : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_HELP_IDENTIFY); + notice_help(Config.s_NickServ, u, NICK_HELP_IDENTIFY); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "IDENTIFY", NICK_IDENTIFY_SYNTAX); + syntax_error(Config.s_NickServ, u, "IDENTIFY", NICK_IDENTIFY_SYNTAX); } }; @@ -128,7 +128,7 @@ class NSIdentify : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_IDENTIFY); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_IDENTIFY); } }; diff --git a/src/core/ns_info.c b/src/core/ns_info.c index b2288f9fe..2d1056bcd 100644 --- a/src/core/ns_info.c +++ b/src/core/ns_info.c @@ -55,26 +55,26 @@ class CommandNSInfo : public Command { if ((nr = findrequestnick(nick))) { - notice_lang(s_NickServ, u, NICK_IS_PREREG); + notice_lang(Config.s_NickServ, u, NICK_IS_PREREG); if (!param.empty() && param == "ALL" && u->nc && u->nc->IsServicesOper()) - notice_lang(s_NickServ, u, NICK_INFO_EMAIL, nr->email); + notice_lang(Config.s_NickServ, u, NICK_INFO_EMAIL, nr->email); else { if (u->nc && u->nc->IsServicesOper()) - notice_lang(s_NickServ, u, NICK_INFO_FOR_MORE, s_NickServ, nr->nick); + notice_lang(Config.s_NickServ, u, NICK_INFO_FOR_MORE, Config.s_NickServ, nr->nick); } } else if (nickIsServices(nick, 1)) - notice_lang(s_NickServ, u, NICK_X_IS_SERVICES, nick); + notice_lang(Config.s_NickServ, u, NICK_X_IS_SERVICES, nick); else - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); } else if (na->HasFlag(NS_FORBIDDEN)) { if (is_oper(u) && na->last_usermask) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN_OPER, nick, na->last_usermask, na->last_realname ? na->last_realname : getstring(u, NO_REASON)); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN_OPER, nick, na->last_usermask, na->last_realname ? na->last_realname : getstring(u, NO_REASON)); else - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, nick); } else { @@ -93,13 +93,13 @@ class CommandNSInfo : public Command if (!param.empty() && param == "ALL" && u->nc && (na->nc == u->nc || u->nc->IsServicesOper())) show_hidden = 1; - notice_lang(s_NickServ, u, NICK_INFO_REALNAME, na->nick, na->last_realname); + notice_lang(Config.s_NickServ, u, NICK_INFO_REALNAME, na->nick, na->last_realname); if (na->nc->IsServicesOper()) { if (show_hidden || (!(na->nc->HasFlag(NI_HIDE_STATUS)))) { - notice_lang(s_NickServ, u, NICK_INFO_SERVICES_OPERTYPE, na->nick, na->nc->ot->GetName().c_str()); + notice_lang(Config.s_NickServ, u, NICK_INFO_SERVICES_OPERTYPE, na->nick, na->nc->ot->GetName().c_str()); } } @@ -107,52 +107,52 @@ class CommandNSInfo : public Command if (nick_online) { if (show_hidden || !(na->nc->HasFlag(NI_HIDE_MASK))) - notice_lang(s_NickServ, u, NICK_INFO_ADDRESS_ONLINE, na->last_usermask); + notice_lang(Config.s_NickServ, u, NICK_INFO_ADDRESS_ONLINE, na->last_usermask); else - notice_lang(s_NickServ, u, NICK_INFO_ADDRESS_ONLINE_NOHOST, na->nick); + notice_lang(Config.s_NickServ, u, NICK_INFO_ADDRESS_ONLINE_NOHOST, na->nick); } else { if (show_hidden || !(na->nc->HasFlag(NI_HIDE_MASK))) - notice_lang(s_NickServ, u, NICK_INFO_ADDRESS, na->last_usermask); + notice_lang(Config.s_NickServ, u, NICK_INFO_ADDRESS, na->last_usermask); } tm = localtime(&na->time_registered); strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_NickServ, u, NICK_INFO_TIME_REGGED, buf); + notice_lang(Config.s_NickServ, u, NICK_INFO_TIME_REGGED, buf); if (!nick_online) { tm = localtime(&na->last_seen); strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_NickServ, u, NICK_INFO_LAST_SEEN, buf); + notice_lang(Config.s_NickServ, u, NICK_INFO_LAST_SEEN, buf); } if (na->last_quit && (show_hidden || !(na->nc->HasFlag(NI_HIDE_QUIT)))) - notice_lang(s_NickServ, u, NICK_INFO_LAST_QUIT, na->last_quit); + notice_lang(Config.s_NickServ, u, NICK_INFO_LAST_QUIT, na->last_quit); if (na->nc->url) - notice_lang(s_NickServ, u, NICK_INFO_URL, na->nc->url); + notice_lang(Config.s_NickServ, u, NICK_INFO_URL, na->nc->url); if (na->nc->email && (show_hidden || !(na->nc->HasFlag(NI_HIDE_EMAIL)))) - notice_lang(s_NickServ, u, NICK_INFO_EMAIL, na->nc->email); + notice_lang(Config.s_NickServ, u, NICK_INFO_EMAIL, na->nc->email); if (na->nc->icq) - notice_lang(s_NickServ, u, NICK_INFO_ICQ, na->nc->icq); + notice_lang(Config.s_NickServ, u, NICK_INFO_ICQ, na->nc->icq); if (show_hidden) { - if (s_HostServ && ircd->vhost) { + if (Config.s_HostServ && ircd->vhost) { if (getvHost(na->nick) != NULL) { if (ircd->vident && getvIdent(na->nick) != NULL) { - notice_lang(s_NickServ, u, NICK_INFO_VHOST2, + notice_lang(Config.s_NickServ, u, NICK_INFO_VHOST2, getvIdent(na->nick), getvHost(na->nick)); } else { - notice_lang(s_NickServ, u, NICK_INFO_VHOST, + notice_lang(Config.s_NickServ, u, NICK_INFO_VHOST, getvHost(na->nick)); } } } if (na->nc->greet) - notice_lang(s_NickServ, u, NICK_INFO_GREET, na->nc->greet); + notice_lang(Config.s_NickServ, u, NICK_INFO_GREET, na->nc->greet); std::string optbuf; @@ -162,32 +162,32 @@ class CommandNSInfo : public Command CheckOptStr(optbuf, NI_MSG, getstring(u, NICK_INFO_OPT_MSG), na->nc); CheckOptStr(optbuf, NI_AUTOOP, getstring(u, NICK_INFO_OPT_AUTOOP), na->nc, true); - notice_lang(s_NickServ, u, NICK_INFO_OPTIONS, optbuf.empty() ? getstring(u, NICK_INFO_OPT_NONE) : optbuf.c_str()); + notice_lang(Config.s_NickServ, u, NICK_INFO_OPTIONS, optbuf.empty() ? getstring(u, NICK_INFO_OPT_NONE) : optbuf.c_str()); if (na->nc->HasFlag(NI_SUSPENDED)) { if (na->last_quit) - notice_lang(s_NickServ, u, NICK_INFO_SUSPENDED, na->last_quit); + notice_lang(Config.s_NickServ, u, NICK_INFO_SUSPENDED, na->last_quit); else - notice_lang(s_NickServ, u, NICK_INFO_SUSPENDED_NO_REASON); + notice_lang(Config.s_NickServ, u, NICK_INFO_SUSPENDED_NO_REASON); } if (na->HasFlag(NS_NO_EXPIRE)) - notice_lang(s_NickServ, u, NICK_INFO_NO_EXPIRE); + notice_lang(Config.s_NickServ, u, NICK_INFO_NO_EXPIRE); else { if (u->nc->IsServicesOper()) { - expt = na->last_seen + NSExpire; + expt = na->last_seen + Config.NSExpire; tm = localtime(&expt); strftime_lang(buf, sizeof(buf), finduser(na->nick), STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_NickServ, u, NICK_INFO_EXPIRE, buf); + notice_lang(Config.s_NickServ, u, NICK_INFO_EXPIRE, buf); } } } if (!show_hidden) - notice_lang(s_NickServ, u, NICK_INFO_FOR_MORE, s_NickServ, na->nick); + notice_lang(Config.s_NickServ, u, NICK_INFO_FOR_MORE, Config.s_NickServ, na->nick); } return MOD_CONT; } @@ -195,15 +195,15 @@ class CommandNSInfo : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (u->nc && u->nc->IsServicesOper()) - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_INFO); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_INFO); else - notice_help(s_NickServ, u, NICK_HELP_INFO); + notice_help(Config.s_NickServ, u, NICK_HELP_INFO); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "INFO", NICK_INFO_SYNTAX); + syntax_error(Config.s_NickServ, u, "INFO", NICK_INFO_SYNTAX); } }; @@ -222,7 +222,7 @@ class NSInfo : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_INFO); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_INFO); } }; diff --git a/src/core/ns_list.c b/src/core/ns_list.c index 891c620d4..2e93cf61a 100644 --- a/src/core/ns_list.c +++ b/src/core/ns_list.c @@ -53,9 +53,9 @@ class CommandNSList : public Command suspended = nsnoexpire = forbidden = unconfirmed = false; - if (NSListOpersOnly && !is_oper(u)) /* reverse the help logic */ + if (Config.NSListOpersOnly && !is_oper(u)) /* reverse the help logic */ { - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); return MOD_STOP; } @@ -64,7 +64,7 @@ class CommandNSList : public Command tmp = myStrGetOnlyToken((pattern + 1), '-', 0); /* Read FROM out */ if (!tmp) { - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); return MOD_CONT; } for (s = tmp; *s; ++s) @@ -72,7 +72,7 @@ class CommandNSList : public Command if (!isdigit(*s)) { delete [] tmp; - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); return MOD_CONT; } } @@ -81,7 +81,7 @@ class CommandNSList : public Command tmp = myStrGetTokenRemainder(pattern, '-', 1); /* Read TO out */ if (!tmp) { - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); return MOD_CONT; } for (s = tmp; *s; ++s) @@ -89,7 +89,7 @@ class CommandNSList : public Command if (!isdigit(*s)) { delete [] tmp; - notice_lang(s_ChanServ, u, LIST_INCORRECT_RANGE); + notice_lang(Config.s_ChanServ, u, LIST_INCORRECT_RANGE); return MOD_CONT; } } @@ -121,7 +121,7 @@ class CommandNSList : public Command mync = u->nc; - notice_lang(s_NickServ, u, NICK_LIST_HEADER, pattern); + notice_lang(Config.s_NickServ, u, NICK_LIST_HEADER, pattern); if (!unconfirmed) { for (i = 0; i < 1024; ++i) @@ -146,7 +146,7 @@ class CommandNSList : public Command snprintf(buf, sizeof(buf), "%s!%s", na->nick, na->last_usermask && !(na->HasFlag(NS_FORBIDDEN)) ? na->last_usermask : "*@*"); if (!stricmp(pattern, na->nick) || Anope::Match(buf, pattern, false)) { - if (((count + 1 >= from && count + 1 <= to) || (!from && !to)) && ++nnicks <= NSListMax) + if (((count + 1 >= from && count + 1 <= to) || (!from && !to)) && ++nnicks <= Config.NSListMax) { if (is_servadmin && (na->HasFlag(NS_NO_EXPIRE))) noexpire_char = '!'; @@ -160,7 +160,7 @@ class CommandNSList : public Command snprintf(buf, sizeof(buf), "%-20s [Suspended]", na->nick); else snprintf(buf, sizeof(buf), "%-20s %s", na->nick, na->last_usermask); - u->SendMessage(s_NickServ, " %c%s", noexpire_char, buf); + u->SendMessage(Config.s_NickServ, " %c%s", noexpire_char, buf); } ++count; } @@ -178,16 +178,16 @@ class CommandNSList : public Command snprintf(buf, sizeof(buf), "%s!*@*", nr->nick); if (!stricmp(pattern, nr->nick) || Anope::Match(buf, pattern, false)) { - if (++nnicks <= NSListMax) + if (++nnicks <= Config.NSListMax) { snprintf(buf, sizeof(buf), "%-20s [UNCONFIRMED]", nr->nick); - u->SendMessage(s_NickServ, " %c%s", noexpire_char, buf); + u->SendMessage(Config.s_NickServ, " %c%s", noexpire_char, buf); } } } } } - notice_lang(s_NickServ, u, NICK_LIST_RESULTS, nnicks > NSListMax ? NSListMax : nnicks, nnicks); + notice_lang(Config.s_NickServ, u, NICK_LIST_RESULTS, nnicks > Config.NSListMax ? Config.NSListMax : nnicks, nnicks); if (tofree) delete [] pattern; return MOD_CONT; @@ -196,9 +196,9 @@ class CommandNSList : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (u->nc && u->nc->IsServicesOper()) - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_LIST); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_LIST); else - notice_help(s_NickServ, u, NICK_HELP_LIST); + notice_help(Config.s_NickServ, u, NICK_HELP_LIST); return true; } @@ -206,9 +206,9 @@ class CommandNSList : public Command void OnSyntaxError(User *u, const ci::string &subcommand) { if (u->nc->IsServicesOper()) - syntax_error(s_NickServ, u, "LIST", NICK_LIST_SERVADMIN_SYNTAX); + syntax_error(Config.s_NickServ, u, "LIST", NICK_LIST_SERVADMIN_SYNTAX); else - syntax_error(s_NickServ, u, "LIST", NICK_LIST_SYNTAX); + syntax_error(Config.s_NickServ, u, "LIST", NICK_LIST_SYNTAX); } }; @@ -227,7 +227,7 @@ class NSList : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_LIST); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_LIST); } }; diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c index c928b96ce..4304d7b18 100644 --- a/src/core/ns_logout.c +++ b/src/core/ns_logout.c @@ -35,9 +35,9 @@ class CommandNSLogout : public Command if (!u->nc->IsServicesOper() && nick) this->OnSyntaxError(u, ""); else if (!(u2 = (nick ? finduser(nick) : u))) - notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_IN_USE, nick); else if (nick && u2->nc && !u2->nc->IsServicesOper()) - notice_lang(s_NickServ, u, NICK_LOGOUT_SERVICESADMIN, nick); + notice_lang(Config.s_NickServ, u, NICK_LOGOUT_SERVICESADMIN, nick); else { na = findnick(u2->nick); @@ -52,13 +52,13 @@ class CommandNSLogout : public Command common_svsmode(u2, ircd->modeonunreg, "1"); u2->isSuperAdmin = 0; /* Dont let people logout and remain a SuperAdmin */ - alog("%s: %s!%s@%s logged out nickname %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, u2->nick); + alog("%s: %s!%s@%s logged out nickname %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, u2->nick); /* Remove founder status from this user in all channels */ if (nick) - notice_lang(s_NickServ, u, NICK_LOGOUT_X_SUCCEEDED, nick); + notice_lang(Config.s_NickServ, u, NICK_LOGOUT_X_SUCCEEDED, nick); else - notice_lang(s_NickServ, u, NICK_LOGOUT_SUCCEEDED); + notice_lang(Config.s_NickServ, u, NICK_LOGOUT_SUCCEEDED); /* Clear any timers again */ if (na && u->nc->HasFlag(NI_KILLPROTECT)) @@ -77,16 +77,16 @@ class CommandNSLogout : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (u->nc && u->nc->IsServicesOper()) - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_LOGOUT); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_LOGOUT); else - notice_help(s_NickServ, u, NICK_HELP_LOGOUT); + notice_help(Config.s_NickServ, u, NICK_HELP_LOGOUT); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "LOGOUT", NICK_LOGOUT_SYNTAX); + syntax_error(Config.s_NickServ, u, "LOGOUT", NICK_LOGOUT_SYNTAX); } }; @@ -105,7 +105,7 @@ class NSLogout : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_LOGOUT); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_LOGOUT); } }; diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c index 98ec3d926..f20855c1d 100644 --- a/src/core/ns_recover.c +++ b/src/core/ns_recover.c @@ -31,15 +31,15 @@ class CommandNSRecover : public Command User *u2; if (!(u2 = finduser(nick))) - notice_lang(s_NickServ, u, NICK_X_NOT_IN_USE, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_IN_USE, nick); else if (!(na = findnick(u2->nick))) - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); else if (na->nc->HasFlag(NI_SUSPENDED)) - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, na->nick); else if (!stricmp(nick, u->nick)) - notice_lang(s_NickServ, u, NICK_NO_RECOVER_SELF); + notice_lang(Config.s_NickServ, u, NICK_NO_RECOVER_SELF); else if (pass) { int res = enc_check_password(pass, na->nc->pass); @@ -48,20 +48,20 @@ class CommandNSRecover : public Command { char relstr[192]; - notice_lang(s_NickServ, u2, FORCENICKCHANGE_NOW); + notice_lang(Config.s_NickServ, u2, FORCENICKCHANGE_NOW); collide(na, 0); - /* Convert NSReleaseTimeout seconds to string format */ - duration(na->nc, relstr, sizeof(relstr), NSReleaseTimeout); + /* Convert Config.NSReleaseTimeout seconds to string format */ + duration(na->nc, relstr, sizeof(relstr), Config.NSReleaseTimeout); - notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick, relstr); + notice_lang(Config.s_NickServ, u, NICK_RECOVERED, Config.s_NickServ, nick, relstr); } else { - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); if (!res) { - alog("%s: RECOVER: invalid password for %s by %s!%s@%s", s_NickServ, nick, u->nick, u->GetIdent().c_str(), u->host); + alog("%s: RECOVER: invalid password for %s by %s!%s@%s", Config.s_NickServ, nick, u->nick, u->GetIdent().c_str(), u->host); bad_password(u); } } @@ -72,16 +72,16 @@ class CommandNSRecover : public Command { char relstr[192]; - notice_lang(s_NickServ, u2, FORCENICKCHANGE_NOW); + notice_lang(Config.s_NickServ, u2, FORCENICKCHANGE_NOW); collide(na, 0); - /* Convert NSReleaseTimeout seconds to string format */ - duration(na->nc, relstr, sizeof(relstr), NSReleaseTimeout); + /* Convert Config.NSReleaseTimeout seconds to string format */ + duration(na->nc, relstr, sizeof(relstr), Config.NSReleaseTimeout); - notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick, relstr); + notice_lang(Config.s_NickServ, u, NICK_RECOVERED, Config.s_NickServ, nick, relstr); } else - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); } return MOD_CONT; } @@ -90,18 +90,18 @@ class CommandNSRecover : public Command { char relstr[192]; - /* Convert NSReleaseTimeout seconds to string format */ - duration(u->nc, relstr, sizeof(relstr), NSReleaseTimeout); + /* Convert Config.NSReleaseTimeout seconds to string format */ + duration(u->nc, relstr, sizeof(relstr), Config.NSReleaseTimeout); - notice_help(s_NickServ, u, NICK_HELP_RECOVER, relstr); - //do_help_limited(s_NickServ, u, this); + notice_help(Config.s_NickServ, u, NICK_HELP_RECOVER, relstr); + //do_help_limited(Config.s_NickServ, u, this); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "RECOVER", NICK_RECOVER_SYNTAX); + syntax_error(Config.s_NickServ, u, "RECOVER", NICK_RECOVER_SYNTAX); } }; @@ -120,7 +120,7 @@ class NSRecover : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_RECOVER); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_RECOVER); } }; diff --git a/src/core/ns_register.c b/src/core/ns_register.c index 903332b34..a569011f6 100644 --- a/src/core/ns_register.c +++ b/src/core/ns_register.c @@ -26,8 +26,8 @@ class CommandNSConfirm : public Command if (!na) { - alog("%s: makenick(%s) failed", s_NickServ, u->nick); - notice_lang(s_NickServ, u, NICK_REGISTRATION_FAILED); + alog("%s: makenick(%s) failed", Config.s_NickServ, u->nick); + notice_lang(Config.s_NickServ, u, NICK_REGISTRATION_FAILED); return MOD_CONT; } @@ -35,7 +35,7 @@ class CommandNSConfirm : public Command memcpy(na->nc->pass, nr->password, PASSMAX); - na->nc->memos.memomax = MSMaxMemos; + na->nc->memos.memomax = Config.MSMaxMemos; if (force) { @@ -47,12 +47,12 @@ class CommandNSConfirm : public Command std::string last_usermask = u->GetIdent() + "@" + u->GetDisplayedHost(); na->last_usermask = sstrdup(last_usermask.c_str()); na->last_realname = sstrdup(u->realname); - if (NSAddAccessOnReg) + if (Config.NSAddAccessOnReg) na->nc->AddAccess(create_mask(u)); } na->time_registered = na->last_seen = time(NULL); - na->nc->language = NSDefLanguage; + na->nc->language = Config.NSDefLanguage; if (nr->email) na->nc->email = sstrdup(nr->email); @@ -61,26 +61,26 @@ class CommandNSConfirm : public Command if (!force) { u->nc = na->nc; - alog("%s: '%s' registered by %s@%s (e-mail: %s)", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nr->email ? nr->email : "none"); - if (NSAddAccessOnReg) - notice_lang(s_NickServ, u, NICK_REGISTERED, u->nick, na->nc->GetAccess(0).c_str()); + alog("%s: '%s' registered by %s@%s (e-mail: %s)", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nr->email ? nr->email : "none"); + if (Config.NSAddAccessOnReg) + notice_lang(Config.s_NickServ, u, NICK_REGISTERED, u->nick, na->nc->GetAccess(0).c_str()); else - notice_lang(s_NickServ, u, NICK_REGISTERED_NO_MASK, u->nick); + notice_lang(Config.s_NickServ, u, NICK_REGISTERED_NO_MASK, u->nick); delete nr; ircdproto->SendAccountLogin(u, u->nc); ircdproto->SetAutoIdentificationToken(u); if (enc_decrypt(na->nc->pass, tmp_pass, PASSMAX - 1) == 1) - notice_lang(s_NickServ, u, NICK_PASSWORD_IS, tmp_pass); + notice_lang(Config.s_NickServ, u, NICK_PASSWORD_IS, tmp_pass); u->lastnickreg = time(NULL); } else { - alog("%s: '%s' confirmed by %s!%s@%s (email: %s)", s_NickServ, nr->nick, u->nick, u->GetIdent().c_str(), u->host, nr->email ? nr->email : "none"); + alog("%s: '%s' confirmed by %s!%s@%s (email: %s)", Config.s_NickServ, nr->nick, u->nick, u->GetIdent().c_str(), u->host, nr->email ? nr->email : "none"); - notice_lang(s_NickServ, u, NICK_FORCE_REG, nr->nick); + notice_lang(Config.s_NickServ, u, NICK_FORCE_REG, nr->nick); User *user = finduser(nr->nick); /* Delrequest must be called before validate_user */ @@ -101,11 +101,11 @@ class CommandNSConfirm : public Command nr = findrequestnick(u->nick); - if (NSEmailReg) + if (Config.NSEmailReg) { if (!passcode) { - notice_lang(s_NickServ, u, NICK_CONFIRM_INVALID); + notice_lang(Config.s_NickServ, u, NICK_CONFIRM_INVALID); return MOD_CONT; } @@ -122,21 +122,21 @@ class CommandNSConfirm : public Command return MOD_CONT; } } - notice_lang(s_NickServ, u, NICK_CONFIRM_NOT_FOUND, s_NickServ); + notice_lang(Config.s_NickServ, u, NICK_CONFIRM_NOT_FOUND, Config.s_NickServ); return MOD_CONT; } if (stricmp(nr->passcode, passcode)) { - notice_lang(s_NickServ, u, NICK_CONFIRM_INVALID); + notice_lang(Config.s_NickServ, u, NICK_CONFIRM_INVALID); return MOD_CONT; } } if (!nr) { - notice_lang(s_NickServ, u, NICK_REGISTRATION_FAILED); + notice_lang(Config.s_NickServ, u, NICK_REGISTRATION_FAILED); return MOD_CONT; } @@ -156,9 +156,9 @@ class CommandNSConfirm : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_HELP_CONFIRM); + notice_help(Config.s_NickServ, u, NICK_HELP_CONFIRM); if (u->nc && u->nc->HasPriv("nickserv/confirm")) - notice_help(s_NickServ, u, NICK_HELP_CONFIRM_OPER); + notice_help(Config.s_NickServ, u, NICK_HELP_CONFIRM_OPER); return true; } }; @@ -175,7 +175,7 @@ class CommandNSRegister : public CommandNSConfirm { NickRequest *nr = NULL, *anr = NULL; NickAlias *na; - int prefixlen = strlen(NSGuestNickPrefix); + int prefixlen = strlen(Config.NSGuestNickPrefix); int nicklen = strlen(u->nick); const char *pass = params[0].c_str(); const char *email = params.size() > 1 ? params[1].c_str() : NULL; @@ -192,19 +192,19 @@ class CommandNSRegister : public CommandNSConfirm if (readonly) { - notice_lang(s_NickServ, u, NICK_REGISTRATION_DISABLED); + notice_lang(Config.s_NickServ, u, NICK_REGISTRATION_DISABLED); return MOD_CONT; } - if (!is_oper(u) && NickRegDelay && time(NULL) - u->my_signon < NickRegDelay) + if (!is_oper(u) && Config.NickRegDelay && time(NULL) - u->my_signon < Config.NickRegDelay) { - notice_lang(s_NickServ, u, NICK_REG_DELAY, NickRegDelay); + notice_lang(Config.s_NickServ, u, NICK_REG_DELAY, Config.NickRegDelay); return MOD_CONT; } if ((anr = findrequestnick(u->nick))) { - notice_lang(s_NickServ, u, NICK_REQUESTED); + notice_lang(Config.s_NickServ, u, NICK_REQUESTED); return MOD_CONT; } @@ -213,53 +213,53 @@ class CommandNSRegister : public CommandNSConfirm /* Guest nick can now have a series of between 1 and 7 digits. * --lara */ - if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && stristr(u->nick, NSGuestNickPrefix) == u->nick && strspn(u->nick + prefixlen, "1234567890") == nicklen - prefixlen) + if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && stristr(u->nick, Config.NSGuestNickPrefix) == u->nick && strspn(u->nick + prefixlen, "1234567890") == nicklen - prefixlen) { - notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); + notice_lang(Config.s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); return MOD_CONT; } if (!ircdproto->IsNickValid(u->nick)) { - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, u->nick); return MOD_CONT; } - if (RestrictOperNicks) + if (Config.RestrictOperNicks) { - for (it = svsopers_in_config.begin(); it != svsopers_in_config.end(); ++it) + for (it = Config.Opers.begin(); it != Config.Opers.end(); ++it) { std::string nick = it->first; if (stristr(u->nick, nick.c_str()) && !is_oper(u)) { - notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); + notice_lang(Config.s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); return MOD_CONT; } } } - if (NSForceEmail && !email) + if (Config.NSForceEmail && !email) this->OnSyntaxError(u, ""); - else if (time(NULL) < u->lastnickreg + NSRegDelay) - notice_lang(s_NickServ, u, NICK_REG_PLEASE_WAIT, (u->lastnickreg + NSRegDelay) - time(NULL)); + else if (time(NULL) < u->lastnickreg + Config.NSRegDelay) + notice_lang(Config.s_NickServ, u, NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config.NSRegDelay) - time(NULL)); else if ((na = findnick(u->nick))) { /* i.e. there's already such a nick regged */ if (na->HasFlag(NS_FORBIDDEN)) { - alog("%s: %s@%s tried to register FORBIDden nick %s", s_NickServ, u->GetIdent().c_str(), u->host, u->nick); - notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); + alog("%s: %s@%s tried to register FORBIDden nick %s", Config.s_NickServ, u->GetIdent().c_str(), u->host, u->nick); + notice_lang(Config.s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick); } else - notice_lang(s_NickServ, u, NICK_ALREADY_REGISTERED, u->nick); + notice_lang(Config.s_NickServ, u, NICK_ALREADY_REGISTERED, u->nick); } - else if (!stricmp(u->nick, pass) || (StrictPasswords && strlen(pass) < 5)) - notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD); + else if (!stricmp(u->nick, pass) || (Config.StrictPasswords && strlen(pass) < 5)) + notice_lang(Config.s_NickServ, u, MORE_OBSCURE_PASSWORD); else if (enc_encrypt_check_len(strlen(pass), PASSMAX - 1)) - notice_lang(s_NickServ, u, PASSWORD_TOO_LONG); + notice_lang(Config.s_NickServ, u, PASSWORD_TOO_LONG); else if (email && !MailValidate(email)) - notice_lang(s_NickServ, u, MAIL_X_INVALID, email); + notice_lang(Config.s_NickServ, u, MAIL_X_INVALID, email); else { for (idx = 0; idx < 9; ++idx) @@ -273,17 +273,17 @@ class CommandNSRegister : public CommandNSConfirm nr->email = sstrdup(email); nr->requested = time(NULL); FOREACH_MOD(I_OnMakeNickRequest, OnMakeNickRequest(nr)); - if (NSEmailReg) + if (Config.NSEmailReg) { if (!do_sendregmail(u, nr)) { - notice_lang(s_NickServ, u, NICK_ENTER_REG_CODE, email, s_NickServ); - alog("%s: sent registration verification code to %s", s_NickServ, nr->email); + notice_lang(Config.s_NickServ, u, NICK_ENTER_REG_CODE, email, Config.s_NickServ); + alog("%s: sent registration verification code to %s", Config.s_NickServ, nr->email); } else { - alog("%s: Unable to send registration verification mail", s_NickServ); - notice_lang(s_NickServ, u, NICK_REG_UNABLE); + alog("%s: Unable to send registration verification mail", Config.s_NickServ); + notice_lang(Config.s_NickServ, u, NICK_REG_UNABLE); delete nr; return MOD_CONT; } @@ -300,16 +300,16 @@ class CommandNSRegister : public CommandNSConfirm bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_HELP_REGISTER); + notice_help(Config.s_NickServ, u, NICK_HELP_REGISTER); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - if (NSForceEmail) - syntax_error(s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX_EMAIL); + if (Config.NSForceEmail) + syntax_error(Config.s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX_EMAIL); else - syntax_error(s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX); + syntax_error(Config.s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX); } }; @@ -324,24 +324,24 @@ class CommandNSResend : public Command CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { NickRequest *nr = NULL; - if (NSEmailReg) + if (Config.NSEmailReg) { if ((nr = findrequestnick(u->nick))) { - if (time(NULL) < nr->lastmail + NSResendDelay) + if (time(NULL) < nr->lastmail + Config.NSResendDelay) { - notice_lang(s_NickServ, u, MAIL_LATER); + notice_lang(Config.s_NickServ, u, MAIL_LATER); return MOD_CONT; } if (!do_sendregmail(u, nr)) { nr->lastmail = time(NULL); - notice_lang(s_NickServ, u, NICK_REG_RESENT, nr->email); - alog("%s: re-sent registration verification code for %s to %s", s_NickServ, nr->nick, nr->email); + notice_lang(Config.s_NickServ, u, NICK_REG_RESENT, nr->email); + alog("%s: re-sent registration verification code for %s to %s", Config.s_NickServ, nr->nick, nr->email); } else { - alog("%s: Unable to re-send registration verification mail for %s", s_NickServ, nr->nick); + alog("%s: Unable to re-send registration verification mail for %s", Config.s_NickServ, nr->nick); return MOD_CONT; } } @@ -351,7 +351,7 @@ class CommandNSResend : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_HELP_RESEND); + notice_help(Config.s_NickServ, u, NICK_HELP_RESEND); return true; } }; @@ -373,11 +373,11 @@ class NSRegister : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_REGISTER); - if (NSEmailReg) + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_REGISTER); + if (Config.NSEmailReg) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_CONFIRM); - notice_lang(s_NickServ, u, NICK_HELP_CMD_RESEND); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_CONFIRM); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_RESEND); } } }; @@ -392,20 +392,20 @@ int do_sendregmail(User *u, NickRequest *nr) if (!nr && !u) return -1; snprintf(buf, sizeof(buf), getstring(NICK_REG_MAIL_SUBJECT), nr->nick); - mail = MailRegBegin(u, nr, buf, s_NickServ); + mail = MailRegBegin(u, nr, buf, Config.s_NickServ); if (!mail) return -1; fprintf(mail->pipe, "%s", getstring(NICK_REG_MAIL_HEAD)); fprintf(mail->pipe, "\n\n"); fprintf(mail->pipe, getstring(NICK_REG_MAIL_LINE_1), nr->nick); fprintf(mail->pipe, "\n\n"); - fprintf(mail->pipe, getstring(NICK_REG_MAIL_LINE_2), s_NickServ, nr->passcode); + fprintf(mail->pipe, getstring(NICK_REG_MAIL_LINE_2), Config.s_NickServ, nr->passcode); fprintf(mail->pipe, "\n\n"); fprintf(mail->pipe, "%s", getstring(NICK_REG_MAIL_LINE_3)); fprintf(mail->pipe, "\n\n"); fprintf(mail->pipe, "%s", getstring(NICK_REG_MAIL_LINE_4)); fprintf(mail->pipe, "\n\n"); - fprintf(mail->pipe, getstring(NICK_REG_MAIL_LINE_5), NetworkName); + fprintf(mail->pipe, getstring(NICK_REG_MAIL_LINE_5), Config.NetworkName); fprintf(mail->pipe, "\n.\n"); MailEnd(mail); return 0; diff --git a/src/core/ns_release.c b/src/core/ns_release.c index fa3b23496..f36f2b8f7 100644 --- a/src/core/ns_release.c +++ b/src/core/ns_release.c @@ -30,27 +30,27 @@ class CommandNSRelease : public Command NickAlias *na; if (!(na = findnick(nick))) - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); else if (na->nc->HasFlag(NI_SUSPENDED)) - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, na->nick); else if (!(na->HasFlag(NS_KILL_HELD))) - notice_lang(s_NickServ, u, NICK_RELEASE_NOT_HELD, nick); + notice_lang(Config.s_NickServ, u, NICK_RELEASE_NOT_HELD, nick); else if (pass) { int res = enc_check_password(pass, na->nc->pass); if (res == 1) { release(na, 0); - notice_lang(s_NickServ, u, NICK_RELEASED); + notice_lang(Config.s_NickServ, u, NICK_RELEASED); } else { - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); if (!res) { - alog("%s: RELEASE: invalid password for %s by %s!%s@%s", s_NickServ, nick, u->nick, u->GetIdent().c_str(), u->host); + alog("%s: RELEASE: invalid password for %s by %s!%s@%s", Config.s_NickServ, nick, u->nick, u->GetIdent().c_str(), u->host); bad_password(u); } } @@ -60,10 +60,10 @@ class CommandNSRelease : public Command if (u->nc == na->nc || (!(na->nc->HasFlag(NI_SECURE)) && is_on_access(u, na->nc))) { release(na, 0); - notice_lang(s_NickServ, u, NICK_RELEASED); + notice_lang(Config.s_NickServ, u, NICK_RELEASED); } else - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); } return MOD_CONT; } @@ -72,18 +72,18 @@ class CommandNSRelease : public Command { char relstr[192]; - /* Convert NSReleaseTimeout seconds to string format */ - duration(u->nc, relstr, sizeof(relstr), NSReleaseTimeout); + /* Convert Config.NSReleaseTimeout seconds to string format */ + duration(u->nc, relstr, sizeof(relstr), Config.NSReleaseTimeout); - notice_help(s_NickServ, u, NICK_HELP_RELEASE, relstr); - //do_help_limited(s_NickServ, u, this); + notice_help(Config.s_NickServ, u, NICK_HELP_RELEASE, relstr); + //do_help_limited(Config.s_NickServ, u, this); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "RELEASE", NICK_RELEASE_SYNTAX); + syntax_error(Config.s_NickServ, u, "RELEASE", NICK_RELEASE_SYNTAX); } }; @@ -102,7 +102,7 @@ class NSRelease : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_RELEASE); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_RELEASE); } }; diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c index f6ee6ad32..54f0608b0 100644 --- a/src/core/ns_saset.c +++ b/src/core/ns_saset.c @@ -43,12 +43,12 @@ private: if (i == nc->aliases.count) { - notice_lang(s_NickServ, u, NICK_SASET_DISPLAY_INVALID, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_DISPLAY_INVALID, nc->display); return MOD_CONT; } change_core_display(nc, param.c_str()); - notice_lang(s_NickServ, u, NICK_SASET_DISPLAY_CHANGED, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_DISPLAY_CHANGED, nc->display); return MOD_CONT; } @@ -65,37 +65,37 @@ private: int len = param.size(); char tmp_pass[PASSMAX]; - if (NSSecureAdmins && u->nc != nc && nc->IsServicesOper()) + if (Config.NSSecureAdmins && u->nc != nc && nc->IsServicesOper()) { - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } - else if (nc->display == param || (StrictPasswords && len < 5)) + else if (nc->display == param || (Config.StrictPasswords && len < 5)) { - notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD); + notice_lang(Config.s_NickServ, u, MORE_OBSCURE_PASSWORD); return MOD_CONT; } else if (enc_encrypt_check_len(len, PASSMAX - 1)) { - notice_lang(s_NickServ, u, PASSWORD_TOO_LONG); + notice_lang(Config.s_NickServ, u, PASSWORD_TOO_LONG); return MOD_CONT; } if (enc_encrypt(param.c_str(), len, nc->pass, PASSMAX - 1) < 0) { - alog("%s: Failed to encrypt password for %s (set)", s_NickServ, nc->display); - notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_FAILED, nc->display); + alog("%s: Failed to encrypt password for %s (set)", Config.s_NickServ, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_PASSWORD_FAILED, nc->display); return MOD_CONT; } if (enc_decrypt(nc->pass, tmp_pass, PASSMAX - 1) == 1) - notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display, tmp_pass); + notice_lang(Config.s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display, tmp_pass); else - notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, nc->display); - alog("%s: %s!%s@%s used SASET PASSWORD on %s (e-mail: %s)", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nc->display, nc->email ? nc->email : "none"); - if (WallSetpass) - ircdproto->SendGlobops(s_NickServ, "\2%s\2 used SASET PASSWORD on \2%s\2", u->nick, nc->display); + alog("%s: %s!%s@%s used SASET PASSWORD on %s (e-mail: %s)", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nc->display, nc->email ? nc->email : "none"); + if (Config.WallSetpass) + ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used SASET PASSWORD on \2%s\2", u->nick, nc->display); return MOD_CONT; } @@ -109,12 +109,12 @@ private: if (param) { nc->url = sstrdup(param); - notice_lang(s_NickServ, u, NICK_SASET_URL_CHANGED, nc->display, param); + notice_lang(Config.s_NickServ, u, NICK_SASET_URL_CHANGED, nc->display, param); } else { nc->url = NULL; - notice_lang(s_NickServ, u, NICK_SASET_URL_UNSET, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_URL_UNSET, nc->display); } return MOD_CONT; } @@ -123,23 +123,23 @@ private: { const char *param = params.size() > 2 ? params[2].c_str() : NULL; - if (!param && NSForceEmail) + if (!param && Config.NSForceEmail) { - notice_lang(s_NickServ, u, NICK_SASET_EMAIL_UNSET_IMPOSSIBLE); + notice_lang(Config.s_NickServ, u, NICK_SASET_EMAIL_UNSET_IMPOSSIBLE); return MOD_CONT; } - else if (NSSecureAdmins && u->nc != nc && nc->IsServicesOper()) + else if (Config.NSSecureAdmins && u->nc != nc && nc->IsServicesOper()) { - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } else if (param && !MailValidate(param)) { - notice_lang(s_NickServ, u, MAIL_X_INVALID, param); + notice_lang(Config.s_NickServ, u, MAIL_X_INVALID, param); return MOD_CONT; } - alog("%s: %s!%s@%s used SASET EMAIL on %s (e-mail: %s)", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nc->display, nc->email ? nc->email : "none"); + alog("%s: %s!%s@%s used SASET EMAIL on %s (e-mail: %s)", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nc->display, nc->email ? nc->email : "none"); if (nc->email) delete [] nc->email; @@ -147,12 +147,12 @@ private: if (param) { nc->email = sstrdup(param); - notice_lang(s_NickServ, u, NICK_SASET_EMAIL_CHANGED, nc->display, param); + notice_lang(Config.s_NickServ, u, NICK_SASET_EMAIL_CHANGED, nc->display, param); } else { nc->email = NULL; - notice_lang(s_NickServ, u, NICK_SASET_EMAIL_UNSET, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_EMAIL_UNSET, nc->display); } return MOD_CONT; } @@ -165,17 +165,17 @@ private: { int32 tmp = atol(param); if (!tmp) - notice_lang(s_NickServ, u, NICK_SASET_ICQ_INVALID, param); + notice_lang(Config.s_NickServ, u, NICK_SASET_ICQ_INVALID, param); else { nc->icq = tmp; - notice_lang(s_NickServ, u, NICK_SASET_ICQ_CHANGED, nc->display, param); + notice_lang(Config.s_NickServ, u, NICK_SASET_ICQ_CHANGED, nc->display, param); } } else { nc->icq = 0; - notice_lang(s_NickServ, u, NICK_SASET_ICQ_UNSET, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_ICQ_UNSET, nc->display); } return MOD_CONT; } @@ -195,12 +195,12 @@ private: snprintf(buf, sizeof(buf), "%s%s%s", param, rest ? " " : "", rest ? rest : ""); nc->greet = sstrdup(buf); - notice_lang(s_NickServ, u, NICK_SASET_GREET_CHANGED, nc->display, buf); + notice_lang(Config.s_NickServ, u, NICK_SASET_GREET_CHANGED, nc->display, buf); } else { nc->greet = NULL; - notice_lang(s_NickServ, u, NICK_SASET_GREET_UNSET, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_GREET_UNSET, nc->display); } return MOD_CONT; } @@ -220,36 +220,36 @@ private: nc->SetFlag(NI_KILLPROTECT); nc->UnsetFlag(NI_KILL_QUICK); nc->UnsetFlag(NI_KILL_IMMED); - notice_lang(s_NickServ, u, NICK_SASET_KILL_ON, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_KILL_ON, nc->display); } else if (param == "QUICK") { nc->SetFlag(NI_KILLPROTECT); nc->SetFlag(NI_KILL_QUICK); nc->UnsetFlag(NI_KILL_IMMED); - notice_lang(s_NickServ, u, NICK_SASET_KILL_QUICK, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_KILL_QUICK, nc->display); } else if (param == "IMMED") { - if (NSAllowKillImmed) + if (Config.NSAllowKillImmed) { nc->SetFlag(NI_KILLPROTECT); nc->SetFlag(NI_KILL_IMMED); nc->UnsetFlag(NI_KILL_QUICK); - notice_lang(s_NickServ, u, NICK_SASET_KILL_IMMED, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_KILL_IMMED, nc->display); } else - notice_lang(s_NickServ, u, NICK_SASET_KILL_IMMED_DISABLED); + notice_lang(Config.s_NickServ, u, NICK_SASET_KILL_IMMED_DISABLED); } else if (param == "OFF") { nc->UnsetFlag(NI_KILLPROTECT); nc->UnsetFlag(NI_KILL_QUICK); nc->UnsetFlag(NI_KILL_IMMED); - notice_lang(s_NickServ, u, NICK_SASET_KILL_OFF, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_KILL_OFF, nc->display); } else - syntax_error(s_NickServ, u, "SASET KILL", NSAllowKillImmed ? NICK_SASET_KILL_IMMED_SYNTAX : NICK_SASET_KILL_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET KILL", Config.NSAllowKillImmed ? NICK_SASET_KILL_IMMED_SYNTAX : NICK_SASET_KILL_SYNTAX); return MOD_CONT; } @@ -266,15 +266,15 @@ private: if (param == "ON") { nc->SetFlag(NI_SECURE); - notice_lang(s_NickServ, u, NICK_SASET_SECURE_ON, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_SECURE_ON, nc->display); } else if (param == "OFF") { nc->UnsetFlag(NI_SECURE); - notice_lang(s_NickServ, u, NICK_SASET_SECURE_OFF, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_SECURE_OFF, nc->display); } else - syntax_error(s_NickServ, u, "SASET SECURE", NICK_SASET_SECURE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET SECURE", NICK_SASET_SECURE_SYNTAX); return MOD_CONT; } @@ -291,15 +291,15 @@ private: if (param == "ON") { nc->SetFlag(NI_PRIVATE); - notice_lang(s_NickServ, u, NICK_SASET_PRIVATE_ON, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_PRIVATE_ON, nc->display); } else if (param == "OFF") { nc->UnsetFlag(NI_PRIVATE); - notice_lang(s_NickServ, u, NICK_SASET_PRIVATE_OFF, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_PRIVATE_OFF, nc->display); } else - syntax_error(s_NickServ, u, "SASET PRIVATE", NICK_SASET_PRIVATE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET PRIVATE", NICK_SASET_PRIVATE_SYNTAX); return MOD_CONT; } @@ -313,24 +313,24 @@ private: return MOD_CONT; } - if (!UsePrivmsg) + if (!Config.UsePrivmsg) { - notice_lang(s_NickServ, u, NICK_SASET_OPTION_DISABLED, "MSG"); + notice_lang(Config.s_NickServ, u, NICK_SASET_OPTION_DISABLED, "MSG"); return MOD_CONT; } if (param == "ON") { nc->SetFlag(NI_MSG); - notice_lang(s_NickServ, u, NICK_SASET_MSG_ON, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_MSG_ON, nc->display); } else if (param == "OFF") { nc->UnsetFlag(NI_MSG); - notice_lang(s_NickServ, u, NICK_SASET_MSG_OFF, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_MSG_OFF, nc->display); } else - syntax_error(s_NickServ, u, "SASET MSG", NICK_SASET_MSG_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET MSG", NICK_SASET_MSG_SYNTAX); return MOD_CONT; } @@ -373,25 +373,25 @@ private: } else { - syntax_error(s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX); return MOD_CONT; } param = params.size() > 3 ? params[3] : ""; if (param.empty()) - syntax_error(s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX); else if (param == "ON") { nc->SetFlag(flag); - notice_lang(s_NickServ, u, onmsg, nc->display, s_NickServ); + notice_lang(Config.s_NickServ, u, onmsg, nc->display, Config.s_NickServ); } else if (param == "OFF") { nc->UnsetFlag(flag); - notice_lang(s_NickServ, u, offmsg, nc->display, s_NickServ); + notice_lang(Config.s_NickServ, u, offmsg, nc->display, Config.s_NickServ); } else - syntax_error(s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX); return MOD_CONT; } @@ -401,22 +401,22 @@ private: if (param.empty()) { - syntax_error(s_NickServ, u, "SASET NOEXPIRE", NICK_SASET_NOEXPIRE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET NOEXPIRE", NICK_SASET_NOEXPIRE_SYNTAX); return MOD_CONT; } if (param == "ON") { na->SetFlag(NS_NO_EXPIRE); - notice_lang(s_NickServ, u, NICK_SASET_NOEXPIRE_ON, na->nick); + notice_lang(Config.s_NickServ, u, NICK_SASET_NOEXPIRE_ON, na->nick); } else if (param == "OFF") { na->UnsetFlag(NS_NO_EXPIRE); - notice_lang(s_NickServ, u, NICK_SASET_NOEXPIRE_OFF, na->nick); + notice_lang(Config.s_NickServ, u, NICK_SASET_NOEXPIRE_OFF, na->nick); } else - syntax_error(s_NickServ, u, "SASET NOEXPIRE", NICK_SASET_NOEXPIRE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET NOEXPIRE", NICK_SASET_NOEXPIRE_SYNTAX); return MOD_CONT; } @@ -433,15 +433,15 @@ private: if (param == "ON") { nc->UnsetFlag(NI_AUTOOP); - notice_lang(s_NickServ, u, NICK_SASET_AUTOOP_ON, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_AUTOOP_ON, nc->display); } else if (param == "OFF") { nc->SetFlag(NI_AUTOOP); - notice_lang(s_NickServ, u, NICK_SASET_AUTOOP_OFF, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SASET_AUTOOP_OFF, nc->display); } else - syntax_error(s_NickServ, u, "SET AUTOOP", NICK_SASET_AUTOOP_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET AUTOOP", NICK_SASET_AUTOOP_SYNTAX); return MOD_CONT; } @@ -460,17 +460,17 @@ private: if (param[strspn(param, "0123456789")]) /* i.e. not a number */ { - syntax_error(s_NickServ, u, "SASET LANGUAGE", NICK_SASET_LANGUAGE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET LANGUAGE", NICK_SASET_LANGUAGE_SYNTAX); return MOD_CONT; } langnum = atoi(param) - 1; if (langnum < 0 || langnum >= NUM_LANGS || langlist[langnum] < 0) { - notice_lang(s_NickServ, u, NICK_SASET_LANGUAGE_UNKNOWN, langnum + 1, s_NickServ); + notice_lang(Config.s_NickServ, u, NICK_SASET_LANGUAGE_UNKNOWN, langnum + 1, Config.s_NickServ); return MOD_CONT; } nc->language = langlist[langnum]; - notice_lang(s_NickServ, u, NICK_SASET_LANGUAGE_CHANGED); + notice_lang(Config.s_NickServ, u, NICK_SASET_LANGUAGE_CHANGED); return MOD_CONT; } @@ -488,19 +488,19 @@ public: if (readonly) { - notice_lang(s_NickServ, u, NICK_SASET_DISABLED); + notice_lang(Config.s_NickServ, u, NICK_SASET_DISABLED); return MOD_CONT; } if (!(na = findnick(nick))) { - notice_lang(s_NickServ, u, NICK_SASET_BAD_NICK, nick); + notice_lang(Config.s_NickServ, u, NICK_SASET_BAD_NICK, nick); return MOD_CONT; } if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); else if (na->nc->HasFlag(NI_SUSPENDED)) - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, na->nick); else if (cmd == "DISPLAY") return this->DoSetDisplay(u, params, na->nc); else if (cmd == "PASSWORD") @@ -530,42 +530,42 @@ public: else if (cmd == "LANGUAGE") return this->DoSetLanguage(u, params, na->nc); else - notice_lang(s_NickServ, u, NICK_SASET_UNKNOWN_OPTION, cmd.c_str()); + notice_lang(Config.s_NickServ, u, NICK_SASET_UNKNOWN_OPTION, cmd.c_str()); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { if (subcommand.empty()) - notice_help(s_NickServ, u, NICK_HELP_SASET); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET); else if (subcommand == "DISPLAY") - notice_help(s_NickServ, u, NICK_HELP_SASET_DISPLAY); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_DISPLAY); else if (subcommand == "PASSWORD") - notice_help(s_NickServ, u, NICK_HELP_SASET_PASSWORD); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_PASSWORD); else if (subcommand == "URL") - notice_help(s_NickServ, u, NICK_HELP_SASET_URL); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_URL); else if (subcommand == "EMAIL") - notice_help(s_NickServ, u, NICK_HELP_SASET_EMAIL); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_EMAIL); else if (subcommand == "ICQ") - notice_help(s_NickServ, u, NICK_HELP_SASET_ICQ); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_ICQ); else if (subcommand == "GREET") - notice_help(s_NickServ, u, NICK_HELP_SASET_GREET); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_GREET); else if (subcommand == "KILL") - notice_help(s_NickServ, u, NICK_HELP_SASET_KILL); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_KILL); else if (subcommand == "SECURE") - notice_help(s_NickServ, u, NICK_HELP_SASET_SECURE); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_SECURE); else if (subcommand == "PRIVATE") - notice_help(s_NickServ, u, NICK_HELP_SASET_PRIVATE); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_PRIVATE); else if (subcommand == "MSG") - notice_help(s_NickServ, u, NICK_HELP_SASET_MSG); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_MSG); else if (subcommand == "HIDE") - notice_help(s_NickServ, u, NICK_HELP_SASET_HIDE); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_HIDE); else if (subcommand == "NOEXPIRE") - notice_help(s_NickServ, u, NICK_HELP_SASET_NOEXPIRE); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_NOEXPIRE); else if (subcommand == "AUTOOP") - notice_help(s_NickServ, u, NICK_HELP_SASET_AUTOOP); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_AUTOOP); else if (subcommand == "LANGUAGE") - notice_help(s_NickServ, u, NICK_HELP_SASET_LANGUAGE); + notice_help(Config.s_NickServ, u, NICK_HELP_SASET_LANGUAGE); else return false; @@ -574,7 +574,7 @@ public: void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "SASET", NICK_SASET_SYNTAX); + syntax_error(Config.s_NickServ, u, "SASET", NICK_SASET_SYNTAX); } }; @@ -593,7 +593,7 @@ public: } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_SASET); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_SASET); } }; diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c index ee7a1c28d..549435bcd 100644 --- a/src/core/ns_sendpass.c +++ b/src/core/ns_sendpass.c @@ -27,12 +27,12 @@ class CommandNSSendPass : public Command const char *nick = params[0].c_str(); NickAlias *na; - if (RestrictMail && !u->nc->HasCommand("nickserv/sendpass")) - notice_lang(s_NickServ, u, ACCESS_DENIED); + if (Config.RestrictMail && !u->nc->HasCommand("nickserv/sendpass")) + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); else if (!(na = findnick(nick))) - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); else { char buf[BUFSIZE]; @@ -42,7 +42,7 @@ class CommandNSSendPass : public Command MailInfo *mail; snprintf(buf, sizeof(buf), getstring(na, NICK_SENDPASS_SUBJECT), na->nick); - mail = MailBegin(u, na->nc, buf, s_NickServ); + mail = MailBegin(u, na->nc, buf, Config.s_NickServ); if (!mail) return MOD_CONT; @@ -56,16 +56,16 @@ class CommandNSSendPass : public Command fprintf(mail->pipe, "\n\n"); fprintf(mail->pipe, "%s", getstring(na, NICK_SENDPASS_LINE_4)); fprintf(mail->pipe, "\n\n"); - fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_5), NetworkName); + fprintf(mail->pipe, getstring(na, NICK_SENDPASS_LINE_5), Config.NetworkName); fprintf(mail->pipe, "\n.\n"); MailEnd(mail); - alog("%s: %s!%s@%s used SENDPASS on %s", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nick); - notice_lang(s_NickServ, u, NICK_SENDPASS_OK, nick); + alog("%s: %s!%s@%s used SENDPASS on %s", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nick); + notice_lang(Config.s_NickServ, u, NICK_SENDPASS_OK, nick); } else - notice_lang(s_NickServ, u, NICK_SENDPASS_UNAVAILABLE); + notice_lang(Config.s_NickServ, u, NICK_SENDPASS_UNAVAILABLE); } return MOD_CONT; @@ -73,13 +73,13 @@ class CommandNSSendPass : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_HELP_SENDPASS); + notice_help(Config.s_NickServ, u, NICK_HELP_SENDPASS); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "SENDPASS", NICK_SENDPASS_SYNTAX); + syntax_error(Config.s_NickServ, u, "SENDPASS", NICK_SENDPASS_SYNTAX); } }; @@ -94,7 +94,7 @@ class NSSendPass : public Module this->AddCommand(NICKSERV, new CommandNSSendPass()); - if (!UseMail) + if (!Config.UseMail) throw ModuleException("Not using mail, whut."); char tmp_pass[PASSMAX]; @@ -105,7 +105,7 @@ class NSSendPass : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_SENDPASS); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_SENDPASS); } }; diff --git a/src/core/ns_set.c b/src/core/ns_set.c index 21395b5d5..d27d87a2d 100644 --- a/src/core/ns_set.c +++ b/src/core/ns_set.c @@ -44,12 +44,12 @@ class CommandNSSet : public Command if (i == nc->aliases.count) { - notice_lang(s_NickServ, u, NICK_SET_DISPLAY_INVALID); + notice_lang(Config.s_NickServ, u, NICK_SET_DISPLAY_INVALID); return MOD_CONT; } change_core_display(nc, param.c_str()); - notice_lang(s_NickServ, u, NICK_SET_DISPLAY_CHANGED, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SET_DISPLAY_CHANGED, nc->display); return MOD_CONT; } @@ -66,30 +66,30 @@ class CommandNSSet : public Command int len = param.size(); char tmp_pass[PASSMAX]; - if (nc->display == param || (StrictPasswords && len < 5)) + if (nc->display == param || (Config.StrictPasswords && len < 5)) { - notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD); + notice_lang(Config.s_NickServ, u, MORE_OBSCURE_PASSWORD); return MOD_CONT; } else if (enc_encrypt_check_len(len, PASSMAX - 1)) { - notice_lang(s_NickServ, u, PASSWORD_TOO_LONG); + notice_lang(Config.s_NickServ, u, PASSWORD_TOO_LONG); return MOD_CONT; } if (enc_encrypt(param.c_str(), len, nc->pass, PASSMAX - 1) < 0) { - alog("%s: Failed to encrypt password for %s (set)", s_NickServ, nc->display); - notice_lang(s_NickServ, u, NICK_SET_PASSWORD_FAILED); + alog("%s: Failed to encrypt password for %s (set)", Config.s_NickServ, nc->display); + notice_lang(Config.s_NickServ, u, NICK_SET_PASSWORD_FAILED); return MOD_CONT; } if (enc_decrypt(nc->pass, tmp_pass, PASSMAX - 1) == 1) - notice_lang(s_NickServ, u, NICK_SET_PASSWORD_CHANGED_TO, tmp_pass); + notice_lang(Config.s_NickServ, u, NICK_SET_PASSWORD_CHANGED_TO, tmp_pass); else - notice_lang(s_NickServ, u, NICK_SET_PASSWORD_CHANGED); + notice_lang(Config.s_NickServ, u, NICK_SET_PASSWORD_CHANGED); - alog("%s: %s!%s@%s (e-mail: %s) changed its password.", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nc->email ? nc->email : "none"); + alog("%s: %s!%s@%s (e-mail: %s) changed its password.", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nc->email ? nc->email : "none"); return MOD_CONT; } @@ -108,17 +108,17 @@ class CommandNSSet : public Command if (param[strspn(param, "0123456789")]) /* i.e. not a number */ { - syntax_error(s_NickServ, u, "SET LANGUAGE", NICK_SET_LANGUAGE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET LANGUAGE", NICK_SET_LANGUAGE_SYNTAX); return MOD_CONT; } langnum = atoi(param) - 1; if (langnum < 0 || langnum >= NUM_LANGS || langlist[langnum] < 0) { - notice_lang(s_NickServ, u, NICK_SET_LANGUAGE_UNKNOWN, langnum + 1, s_NickServ); + notice_lang(Config.s_NickServ, u, NICK_SET_LANGUAGE_UNKNOWN, langnum + 1, Config.s_NickServ); return MOD_CONT; } nc->language = langlist[langnum]; - notice_lang(s_NickServ, u, NICK_SET_LANGUAGE_CHANGED); + notice_lang(Config.s_NickServ, u, NICK_SET_LANGUAGE_CHANGED); return MOD_CONT; } @@ -132,12 +132,12 @@ class CommandNSSet : public Command if (param) { nc->url = sstrdup(param); - notice_lang(s_NickServ, u, NICK_SET_URL_CHANGED, param); + notice_lang(Config.s_NickServ, u, NICK_SET_URL_CHANGED, param); } else { nc->url = NULL; - notice_lang(s_NickServ, u, NICK_SET_URL_UNSET); + notice_lang(Config.s_NickServ, u, NICK_SET_URL_UNSET); } return MOD_CONT; } @@ -146,18 +146,18 @@ class CommandNSSet : public Command { const char *param = params.size() > 1 ? params[1].c_str() : NULL; - if (!param && NSForceEmail) + if (!param && Config.NSForceEmail) { - notice_lang(s_NickServ, u, NICK_SET_EMAIL_UNSET_IMPOSSIBLE); + notice_lang(Config.s_NickServ, u, NICK_SET_EMAIL_UNSET_IMPOSSIBLE); return MOD_CONT; } else if (param && !MailValidate(param)) { - notice_lang(s_NickServ, u, MAIL_X_INVALID, param); + notice_lang(Config.s_NickServ, u, MAIL_X_INVALID, param); return MOD_CONT; } - alog("%s: %s!%s@%s (e-mail: %s) changed its e-mail to %s.", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nc->email ? nc->email : "none", param ? param : "none"); + alog("%s: %s!%s@%s (e-mail: %s) changed its e-mail to %s.", Config.s_NickServ, u->nick, u->GetIdent().c_str(), u->host, nc->email ? nc->email : "none", param ? param : "none"); if (nc->email) delete [] nc->email; @@ -165,12 +165,12 @@ class CommandNSSet : public Command if (param) { nc->email = sstrdup(param); - notice_lang(s_NickServ, u, NICK_SET_EMAIL_CHANGED, param); + notice_lang(Config.s_NickServ, u, NICK_SET_EMAIL_CHANGED, param); } else { nc->email = NULL; - notice_lang(s_NickServ, u, NICK_SET_EMAIL_UNSET); + notice_lang(Config.s_NickServ, u, NICK_SET_EMAIL_UNSET); } return MOD_CONT; } @@ -183,17 +183,17 @@ class CommandNSSet : public Command { int32 tmp = atol(param); if (!tmp) - notice_lang(s_NickServ, u, NICK_SET_ICQ_INVALID, param); + notice_lang(Config.s_NickServ, u, NICK_SET_ICQ_INVALID, param); else { nc->icq = tmp; - notice_lang(s_NickServ, u, NICK_SET_ICQ_CHANGED, param); + notice_lang(Config.s_NickServ, u, NICK_SET_ICQ_CHANGED, param); } } else { nc->icq = 0; - notice_lang(s_NickServ, u, NICK_SET_ICQ_UNSET); + notice_lang(Config.s_NickServ, u, NICK_SET_ICQ_UNSET); } return MOD_CONT; } @@ -213,12 +213,12 @@ class CommandNSSet : public Command snprintf(buf, sizeof(buf), "%s%s%s", param, rest ? " " : "", rest ? rest : ""); nc->greet = sstrdup(buf); - notice_lang(s_NickServ, u, NICK_SET_GREET_CHANGED, buf); + notice_lang(Config.s_NickServ, u, NICK_SET_GREET_CHANGED, buf); } else { nc->greet = NULL; - notice_lang(s_NickServ, u, NICK_SET_GREET_UNSET); + notice_lang(Config.s_NickServ, u, NICK_SET_GREET_UNSET); } return MOD_CONT; } @@ -238,36 +238,36 @@ class CommandNSSet : public Command nc->SetFlag(NI_KILLPROTECT); nc->UnsetFlag(NI_KILL_QUICK); nc->UnsetFlag(NI_KILL_IMMED); - notice_lang(s_NickServ, u, NICK_SET_KILL_ON); + notice_lang(Config.s_NickServ, u, NICK_SET_KILL_ON); } else if (param == "QUICK") { nc->SetFlag(NI_KILLPROTECT); nc->SetFlag(NI_KILL_QUICK); nc->UnsetFlag(NI_KILL_IMMED); - notice_lang(s_NickServ, u, NICK_SET_KILL_QUICK); + notice_lang(Config.s_NickServ, u, NICK_SET_KILL_QUICK); } else if (param == "IMMED") { - if (NSAllowKillImmed) + if (Config.NSAllowKillImmed) { nc->SetFlag(NI_KILLPROTECT); nc->SetFlag(NI_KILL_IMMED); nc->UnsetFlag(NI_KILL_QUICK); - notice_lang(s_NickServ, u, NICK_SET_KILL_IMMED); + notice_lang(Config.s_NickServ, u, NICK_SET_KILL_IMMED); } else - notice_lang(s_NickServ, u, NICK_SET_KILL_IMMED_DISABLED); + notice_lang(Config.s_NickServ, u, NICK_SET_KILL_IMMED_DISABLED); } else if (param == "OFF") { nc->UnsetFlag(NI_KILLPROTECT); nc->UnsetFlag(NI_KILL_QUICK); nc->UnsetFlag(NI_KILL_IMMED); - notice_lang(s_NickServ, u, NICK_SET_KILL_OFF); + notice_lang(Config.s_NickServ, u, NICK_SET_KILL_OFF); } else - syntax_error(s_NickServ, u, "SET KILL", NSAllowKillImmed ? NICK_SET_KILL_IMMED_SYNTAX : NICK_SET_KILL_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET KILL", Config.NSAllowKillImmed ? NICK_SET_KILL_IMMED_SYNTAX : NICK_SET_KILL_SYNTAX); return MOD_CONT; } @@ -284,15 +284,15 @@ class CommandNSSet : public Command if (param == "ON") { nc->SetFlag(NI_SECURE); - notice_lang(s_NickServ, u, NICK_SET_SECURE_ON); + notice_lang(Config.s_NickServ, u, NICK_SET_SECURE_ON); } else if (param == "OFF") { nc->UnsetFlag(NI_SECURE); - notice_lang(s_NickServ, u, NICK_SET_SECURE_OFF); + notice_lang(Config.s_NickServ, u, NICK_SET_SECURE_OFF); } else - syntax_error(s_NickServ, u, "SET SECURE", NICK_SET_SECURE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET SECURE", NICK_SET_SECURE_SYNTAX); return MOD_CONT; } @@ -309,15 +309,15 @@ class CommandNSSet : public Command if (param == "ON") { nc->SetFlag(NI_PRIVATE); - notice_lang(s_NickServ, u, NICK_SET_PRIVATE_ON); + notice_lang(Config.s_NickServ, u, NICK_SET_PRIVATE_ON); } else if (param == "OFF") { nc->UnsetFlag(NI_PRIVATE); - notice_lang(s_NickServ, u, NICK_SET_PRIVATE_OFF); + notice_lang(Config.s_NickServ, u, NICK_SET_PRIVATE_OFF); } else - syntax_error(s_NickServ, u, "SET PRIVATE", NICK_SET_PRIVATE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET PRIVATE", NICK_SET_PRIVATE_SYNTAX); return MOD_CONT; } @@ -331,24 +331,24 @@ class CommandNSSet : public Command return MOD_CONT; } - if (!UsePrivmsg) + if (!Config.UsePrivmsg) { - notice_lang(s_NickServ, u, NICK_SET_OPTION_DISABLED, "MSG"); + notice_lang(Config.s_NickServ, u, NICK_SET_OPTION_DISABLED, "MSG"); return MOD_CONT; } if (param == "ON") { nc->SetFlag(NI_MSG); - notice_lang(s_NickServ, u, NICK_SET_MSG_ON); + notice_lang(Config.s_NickServ, u, NICK_SET_MSG_ON); } else if (param == "OFF") { nc->UnsetFlag(NI_MSG); - notice_lang(s_NickServ, u, NICK_SET_MSG_OFF); + notice_lang(Config.s_NickServ, u, NICK_SET_MSG_OFF); } else - syntax_error(s_NickServ, u, "SET MSG", NICK_SET_MSG_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET MSG", NICK_SET_MSG_SYNTAX); return MOD_CONT; } @@ -391,25 +391,25 @@ class CommandNSSet : public Command } else { - syntax_error(s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX); return MOD_CONT; } param = params.size() > 2 ? params[2] : ""; if (param.empty()) - syntax_error(s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX); else if (param == "ON") { nc->SetFlag(flag); - notice_lang(s_NickServ, u, onmsg, s_NickServ); + notice_lang(Config.s_NickServ, u, onmsg, Config.s_NickServ); } else if (param == "OFF") { nc->UnsetFlag(flag); - notice_lang(s_NickServ, u, offmsg, s_NickServ); + notice_lang(Config.s_NickServ, u, offmsg, Config.s_NickServ); } else - syntax_error(s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX); return MOD_CONT; } @@ -431,15 +431,15 @@ class CommandNSSet : public Command if (param == "ON") { nc->UnsetFlag(NI_AUTOOP); - notice_lang(s_NickServ, u, NICK_SET_AUTOOP_ON); + notice_lang(Config.s_NickServ, u, NICK_SET_AUTOOP_ON); } else if (param == "OFF") { nc->SetFlag(NI_AUTOOP); - notice_lang(s_NickServ, u, NICK_SET_AUTOOP_OFF); + notice_lang(Config.s_NickServ, u, NICK_SET_AUTOOP_OFF); } else - syntax_error(s_NickServ, u, "SET AUTOOP", NICK_SET_AUTOOP_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET AUTOOP", NICK_SET_AUTOOP_SYNTAX); return MOD_CONT; } @@ -454,16 +454,16 @@ class CommandNSSet : public Command if (readonly) { - notice_lang(s_NickServ, u, NICK_SET_DISABLED); + notice_lang(Config.s_NickServ, u, NICK_SET_DISABLED); return MOD_CONT; } /* if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); */ if (u->nc->HasFlag(NI_SUSPENDED)) - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, u->nc->display); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, u->nc->display); else if (cmd == "DISPLAY") return this->DoSetDisplay(u, params, u->nc); else if (cmd == "PASSWORD") @@ -491,38 +491,38 @@ class CommandNSSet : public Command else if (cmd == "AUTOOP") return this->DoSetAutoOP(u, params, u->nc); else - notice_lang(s_NickServ, u, NICK_SET_UNKNOWN_OPTION, cmd.c_str()); + notice_lang(Config.s_NickServ, u, NICK_SET_UNKNOWN_OPTION, cmd.c_str()); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { if (subcommand.empty()) - notice_help(s_NickServ, u, NICK_HELP_SET); + notice_help(Config.s_NickServ, u, NICK_HELP_SET); else if (subcommand == "DISPLAY") - notice_help(s_NickServ, u, NICK_HELP_SET_DISPLAY); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_DISPLAY); else if (subcommand == "PASSWORD") - notice_help(s_NickServ, u, NICK_HELP_SET_PASSWORD); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_PASSWORD); else if (subcommand == "URL") - notice_help(s_NickServ, u, NICK_HELP_SET_URL); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_URL); else if (subcommand == "EMAIL") - notice_help(s_NickServ, u, NICK_HELP_SET_EMAIL); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_EMAIL); else if (subcommand == "ICQ") - notice_help(s_NickServ, u, NICK_HELP_SET_ICQ); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_ICQ); else if (subcommand == "GREET") - notice_help(s_NickServ, u, NICK_HELP_SET_GREET); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_GREET); else if (subcommand == "KILL") - notice_help(s_NickServ, u, NICK_HELP_SET_KILL); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_KILL); else if (subcommand == "SECURE") - notice_help(s_NickServ, u, NICK_HELP_SET_SECURE); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_SECURE); else if (subcommand == "PRIVATE") - notice_help(s_NickServ, u, NICK_HELP_SET_PRIVATE); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_PRIVATE); else if (subcommand == "MSG") - notice_help(s_NickServ, u, NICK_HELP_SET_MSG); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_MSG); else if (subcommand == "HIDE") - notice_help(s_NickServ, u, NICK_HELP_SET_HIDE); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_HIDE); else if (subcommand == "AUTOOP") - notice_help(s_NickServ, u, NICK_HELP_SET_AUTOOP); + notice_help(Config.s_NickServ, u, NICK_HELP_SET_AUTOOP); else return false; @@ -531,7 +531,7 @@ class CommandNSSet : public Command void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "SET", NICK_SET_SYNTAX); + syntax_error(Config.s_NickServ, u, "SET", NICK_SET_SYNTAX); } }; @@ -550,7 +550,7 @@ class NSSet : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_SET); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_SET); } }; diff --git a/src/core/ns_status.c b/src/core/ns_status.c index 178817eec..8f828e645 100644 --- a/src/core/ns_status.c +++ b/src/core/ns_status.c @@ -40,18 +40,18 @@ class CommandNSStatus : public Command na = findnick(nick); if (!(u2 = finduser(nick))) /* Nick is not online */ - notice_lang(s_NickServ, u, NICK_STATUS_REPLY, nick, 0, ""); + notice_lang(Config.s_NickServ, u, NICK_STATUS_REPLY, nick, 0, ""); else if (nick_identified(u2) && na && na->nc == u2->nc) /* Nick is identified */ - notice_lang(s_NickServ, u, NICK_STATUS_REPLY, nick, 3, u2->nc->display); + notice_lang(Config.s_NickServ, u, NICK_STATUS_REPLY, nick, 3, u2->nc->display); else if (u2->IsRecognized()) /* Nick is recognised, but NOT identified */ - notice_lang(s_NickServ, u, NICK_STATUS_REPLY, nick, 2, (u2->nc ? u2->nc->display : "")); + notice_lang(Config.s_NickServ, u, NICK_STATUS_REPLY, nick, 2, (u2->nc ? u2->nc->display : "")); else if (!na) /* Nick is online, but NOT a registered */ - notice_lang(s_NickServ, u, NICK_STATUS_REPLY, nick, 0, ""); + notice_lang(Config.s_NickServ, u, NICK_STATUS_REPLY, nick, 0, ""); else /* Nick is not identified for the nick, but they could be logged into an account, * so we tell the user about it */ - notice_lang(s_NickServ, u, NICK_STATUS_REPLY, nick, 1, (u2->nc ? u2->nc->display : "")); + notice_lang(Config.s_NickServ, u, NICK_STATUS_REPLY, nick, 1, (u2->nc ? u2->nc->display : "")); /* Get the next nickname */ nick = params.size() > i ? params[i].c_str() : NULL; @@ -61,7 +61,7 @@ class CommandNSStatus : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_HELP_STATUS); + notice_help(Config.s_NickServ, u, NICK_HELP_STATUS); return true; } }; @@ -81,7 +81,7 @@ class NSStatus : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_STATUS); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_STATUS); } }; diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c index fbdce2f97..c7a1690ae 100644 --- a/src/core/ns_suspend.c +++ b/src/core/ns_suspend.c @@ -32,25 +32,25 @@ class CommandNSSuspend : public Command if (readonly) { - notice_lang(s_NickServ, u, READ_ONLY_MODE); + notice_lang(Config.s_NickServ, u, READ_ONLY_MODE); return MOD_CONT; } if (!(na = findnick(nick))) { - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); return MOD_CONT; } if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); return MOD_CONT; } - if (NSSecureAdmins && na->nc->IsServicesOper()) + if (Config.NSSecureAdmins && na->nc->IsServicesOper()) { - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -78,31 +78,31 @@ class CommandNSSuspend : public Command } } - if (WallForbid) - ircdproto->SendGlobops(s_NickServ, "\2%s\2 used SUSPEND on \2%s\2", u->nick, nick); + if (Config.WallForbid) + ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used SUSPEND on \2%s\2", u->nick, nick); - alog("%s: %s set SUSPEND for nick %s", s_NickServ, u->nick, nick); - notice_lang(s_NickServ, u, NICK_SUSPEND_SUCCEEDED, nick); + alog("%s: %s set SUSPEND for nick %s", Config.s_NickServ, u->nick, nick); + notice_lang(Config.s_NickServ, u, NICK_SUSPEND_SUCCEEDED, nick); FOREACH_MOD(I_OnNickSuspended, OnNickSuspend(na)) } else { - alog("%s: Valid SUSPEND for %s by %s failed", s_NickServ, nick, u->nick); - notice_lang(s_NickServ, u, NICK_SUSPEND_FAILED, nick); + alog("%s: Valid SUSPEND for %s by %s failed", Config.s_NickServ, nick, u->nick); + notice_lang(Config.s_NickServ, u, NICK_SUSPEND_FAILED, nick); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_SUSPEND); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_SUSPEND); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "SUSPEND", NICK_SUSPEND_SYNTAX); + syntax_error(Config.s_NickServ, u, "SUSPEND", NICK_SUSPEND_SYNTAX); } }; @@ -120,25 +120,25 @@ class CommandNSUnSuspend : public Command if (readonly) { - notice_lang(s_NickServ, u, READ_ONLY_MODE); + notice_lang(Config.s_NickServ, u, READ_ONLY_MODE); return MOD_CONT; } if (!(na = findnick(nick))) { - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); return MOD_CONT; } if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick); return MOD_CONT; } - if (NSSecureAdmins && na->nc->IsServicesOper()) + if (Config.NSSecureAdmins && na->nc->IsServicesOper()) { - notice_lang(s_NickServ, u, ACCESS_DENIED); + notice_lang(Config.s_NickServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -146,31 +146,31 @@ class CommandNSUnSuspend : public Command { na->nc->UnsetFlag(NI_SUSPENDED); - if (WallForbid) - ircdproto->SendGlobops(s_NickServ, "\2%s\2 used UNSUSPEND on \2%s\2", u->nick, nick); + if (Config.WallForbid) + ircdproto->SendGlobops(Config.s_NickServ, "\2%s\2 used UNSUSPEND on \2%s\2", u->nick, nick); - alog("%s: %s set UNSUSPEND for nick %s", s_NickServ, u->nick, nick); - notice_lang(s_NickServ, u, NICK_UNSUSPEND_SUCCEEDED, nick); + alog("%s: %s set UNSUSPEND for nick %s", Config.s_NickServ, u->nick, nick); + notice_lang(Config.s_NickServ, u, NICK_UNSUSPEND_SUCCEEDED, nick); FOREACH_MOD(I_OnNickUnsuspended, OnNickUnsuspended(na)); } else { - alog("%s: Valid UNSUSPEND for %s by %s failed", s_NickServ, nick, u->nick); - notice_lang(s_NickServ, u, NICK_UNSUSPEND_FAILED, nick); + alog("%s: Valid UNSUSPEND for %s by %s failed", Config.s_NickServ, nick, u->nick); + notice_lang(Config.s_NickServ, u, NICK_UNSUSPEND_FAILED, nick); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_UNSUSPEND); + notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_UNSUSPEND); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_NickServ, u, "UNSUSPEND", NICK_UNSUSPEND_SYNTAX); + syntax_error(Config.s_NickServ, u, "UNSUSPEND", NICK_UNSUSPEND_SYNTAX); } }; @@ -190,8 +190,8 @@ class NSSuspend : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_SUSPEND); - notice_lang(s_NickServ, u, NICK_HELP_CMD_UNSUSPEND); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_SUSPEND); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_UNSUSPEND); } }; diff --git a/src/core/ns_update.c b/src/core/ns_update.c index c1a6d66a5..395b4b586 100644 --- a/src/core/ns_update.c +++ b/src/core/ns_update.c @@ -38,13 +38,13 @@ class CommandNSUpdate : public Command na->last_seen = time(NULL); if (ircd->vhost) do_on_id(u); - notice_lang(s_NickServ, u, NICK_UPDATE_SUCCESS, s_NickServ); + notice_lang(Config.s_NickServ, u, NICK_UPDATE_SUCCESS, Config.s_NickServ); return MOD_CONT; } bool OnHelp(User *u, const ci::string &) { - notice_help(s_NickServ, u, NICK_HELP_UPDATE); + notice_help(Config.s_NickServ, u, NICK_HELP_UPDATE); return true; } }; @@ -62,7 +62,7 @@ class NSUpdate : public Module } void OnNickServHelp(User *u) { - notice_lang(s_NickServ, u, NICK_HELP_CMD_UPDATE); + notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_UPDATE); } }; diff --git a/src/core/os_akill.c b/src/core/os_akill.c index 32169e2d4..ae36ad5da 100644 --- a/src/core/os_akill.c +++ b/src/core/os_akill.c @@ -41,7 +41,7 @@ class CommandOSAKill : public Command else expiry = NULL; - expires = expiry ? dotime(expiry) : AutokillExpiry; + expires = expiry ? dotime(expiry) : Config.AutokillExpiry; /* If the expiry given does not contain a final letter, it's in days, * said the doc. Ah well. */ @@ -50,7 +50,7 @@ class CommandOSAKill : public Command /* Do not allow less than a minute expiry time */ if (expires != 0 && expires < 60) { - notice_lang(s_OperServ, u, BAD_EXPIRY_TIME); + notice_lang(Config.s_OperServ, u, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -66,19 +66,19 @@ class CommandOSAKill : public Command /* We first do some sanity check on the proposed mask. */ if (strchr(mask, '!')) { - notice_lang(s_OperServ, u, OPER_AKILL_NO_NICK); + notice_lang(Config.s_OperServ, u, OPER_AKILL_NO_NICK); return MOD_CONT; } if (!strchr(mask, '@')) { - notice_lang(s_OperServ, u, BAD_USERHOST_MASK); + notice_lang(Config.s_OperServ, u, BAD_USERHOST_MASK); return MOD_CONT; } if (mask && strspn(mask, "~@.*?") == strlen(mask)) { - notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask); + notice_lang(Config.s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask); return MOD_CONT; } @@ -87,7 +87,7 @@ class CommandOSAKill : public Command * breason to match bufsize * -Rob **/ - if (AddAkiller) + if (Config.AddAkiller) snprintf(realreason, sizeof(realreason), "[%s] %s", u->nick, reason); else snprintf(realreason, sizeof(realreason), "%s", reason); @@ -96,10 +96,10 @@ class CommandOSAKill : public Command if (deleted < 0) return MOD_CONT; else if (deleted) - notice_lang(s_OperServ, u, OPER_AKILL_DELETED_SEVERAL, deleted); - notice_lang(s_OperServ, u, OPER_AKILL_ADDED, mask); + notice_lang(Config.s_OperServ, u, OPER_AKILL_DELETED_SEVERAL, deleted); + notice_lang(Config.s_OperServ, u, OPER_AKILL_ADDED, mask); - if (WallOSAkill) + if (Config.WallOSAkill) { char buf[128]; @@ -129,11 +129,11 @@ class CommandOSAKill : public Command snprintf(buf, sizeof(buf), "expires in %d %s%s", wall_expiry, s, wall_expiry == 1 ? "" : "s"); } - ircdproto->SendGlobops(s_OperServ, "%s added an AKILL for %s (%s) (%s)", u->nick, mask, realreason, buf); + ircdproto->SendGlobops(Config.s_OperServ, "%s added an AKILL for %s (%s) (%s)", u->nick, mask, realreason, buf); } if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); } else this->OnSyntaxError(u, "ADD"); @@ -156,7 +156,7 @@ class CommandOSAKill : public Command if (!akills.count) { - notice_lang(s_OperServ, u, OPER_AKILL_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_AKILL_LIST_EMPTY); return MOD_CONT; } @@ -166,28 +166,28 @@ class CommandOSAKill : public Command res = slist_delete_range(&akills, mask, NULL); if (!res) { - notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_AKILL_NO_MATCH); return MOD_CONT; } else if (res == 1) - notice_lang(s_OperServ, u, OPER_AKILL_DELETED_ONE); + notice_lang(Config.s_OperServ, u, OPER_AKILL_DELETED_ONE); else - notice_lang(s_OperServ, u, OPER_AKILL_DELETED_SEVERAL, res); + notice_lang(Config.s_OperServ, u, OPER_AKILL_DELETED_SEVERAL, res); } else { if ((res = slist_indexof(&akills, const_cast<void *>(static_cast<const void *>(mask)))) == -1) // XXX: possibly unsafe cast { - notice_lang(s_OperServ, u, OPER_AKILL_NOT_FOUND, mask); + notice_lang(Config.s_OperServ, u, OPER_AKILL_NOT_FOUND, mask); return MOD_CONT; } slist_delete(&akills, res); - notice_lang(s_OperServ, u, OPER_AKILL_DELETED, mask); + notice_lang(Config.s_OperServ, u, OPER_AKILL_DELETED, mask); } if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); return MOD_CONT; } @@ -199,7 +199,7 @@ class CommandOSAKill : public Command if (!akills.count) { - notice_lang(s_OperServ, u, OPER_AKILL_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_AKILL_LIST_EMPTY); return MOD_CONT; } @@ -210,11 +210,11 @@ class CommandOSAKill : public Command res = slist_enum(&akills, mask, &akill_list_callback, u, &sent_header); if (!res) { - notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_AKILL_NO_MATCH); return MOD_CONT; } else - notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Akill"); + notice_lang(Config.s_OperServ, u, END_OF_ANY_LIST, "Akill"); } else { @@ -229,9 +229,9 @@ class CommandOSAKill : public Command } if (!sent_header) - notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_AKILL_NO_MATCH); else - notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Akill"); + notice_lang(Config.s_OperServ, u, END_OF_ANY_LIST, "Akill"); } return MOD_CONT; @@ -244,7 +244,7 @@ class CommandOSAKill : public Command if (!akills.count) { - notice_lang(s_OperServ, u, OPER_AKILL_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_AKILL_LIST_EMPTY); return MOD_CONT; } @@ -255,7 +255,7 @@ class CommandOSAKill : public Command res = slist_enum(&akills, mask, &akill_view_callback, u, &sent_header); if (!res) { - notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_AKILL_NO_MATCH); return MOD_CONT; } } @@ -272,7 +272,7 @@ class CommandOSAKill : public Command } if (!sent_header) - notice_lang(s_OperServ, u, OPER_AKILL_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_AKILL_NO_MATCH); } return MOD_CONT; @@ -281,7 +281,7 @@ class CommandOSAKill : public Command CommandReturn DoClear(User *u) { slist_clear(&akills, 1); - notice_lang(s_OperServ, u, OPER_AKILL_CLEAR); + notice_lang(Config.s_OperServ, u, OPER_AKILL_CLEAR); return MOD_CONT; } @@ -311,13 +311,13 @@ class CommandOSAKill : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_AKILL); + notice_help(Config.s_OperServ, u, OPER_HELP_AKILL); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX); + syntax_error(Config.s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX); } }; @@ -335,7 +335,7 @@ class OSAKill : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_AKILL); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_AKILL); } }; @@ -350,7 +350,7 @@ int akill_view(int number, Akill *ak, User *u, int *sent_header) if (!*sent_header) { - notice_lang(s_OperServ, u, OPER_AKILL_VIEW_HEADER); + notice_lang(Config.s_OperServ, u, OPER_AKILL_VIEW_HEADER); *sent_header = 1; } @@ -358,7 +358,7 @@ int akill_view(int number, Akill *ak, User *u, int *sent_header) tm = *localtime(&ak->seton); strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); expire_left(u->nc, expirebuf, sizeof(expirebuf), ak->expires); - notice_lang(s_OperServ, u, OPER_AKILL_VIEW_FORMAT, number, mask, ak->by, timebuf, expirebuf, ak->reason); + notice_lang(Config.s_OperServ, u, OPER_AKILL_VIEW_FORMAT, number, mask, ak->by, timebuf, expirebuf, ak->reason); return 1; } @@ -391,12 +391,12 @@ int akill_list(int number, Akill *ak, User *u, int *sent_header) if (!*sent_header) { - notice_lang(s_OperServ, u, OPER_AKILL_LIST_HEADER); + notice_lang(Config.s_OperServ, u, OPER_AKILL_LIST_HEADER); *sent_header = 1; } snprintf(mask, sizeof(mask), "%s@%s", ak->user, ak->host); - notice_lang(s_OperServ, u, OPER_AKILL_LIST_FORMAT, number, mask, ak->reason); + notice_lang(Config.s_OperServ, u, OPER_AKILL_LIST_FORMAT, number, mask, ak->reason); return 1; } diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c index ff0eae474..acd734deb 100644 --- a/src/core/os_chankill.c +++ b/src/core/os_chankill.c @@ -42,12 +42,12 @@ class CommandOSChanKill : public Command else expiry = NULL; - expires = expiry ? dotime(expiry) : ChankillExpiry; + expires = expiry ? dotime(expiry) : Config.ChankillExpiry; if (expiry && isdigit(expiry[strlen(expiry) - 1])) expires *= 86400; if (expires != 0 && expires < 60) { - notice_lang(s_OperServ, u, BAD_EXPIRY_TIME); + notice_lang(Config.s_OperServ, u, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -62,7 +62,7 @@ class CommandOSChanKill : public Command if (*reason) { - if (AddAkiller) + if (Config.AddAkiller) snprintf(realreason, sizeof(realreason), "[%s] %s", u->nick, reason); else snprintf(realreason, sizeof(realreason), "%s", reason); @@ -76,27 +76,27 @@ class CommandOSChanKill : public Command continue; strlcpy(mask, "*@", sizeof(mask)); /* Use *@" for the akill's, */ strlcat(mask, cu->user->host, sizeof(mask)); - add_akill(NULL, mask, s_OperServ, expires, realreason); + add_akill(NULL, mask, Config.s_OperServ, expires, realreason); check_akill(cu->user->nick, cu->user->GetIdent().c_str(), cu->user->host, NULL, NULL); } - if (WallOSAkill) - ircdproto->SendGlobops(s_OperServ, "%s used CHANKILL on %s (%s)", u->nick, channel, realreason); + if (Config.WallOSAkill) + ircdproto->SendGlobops(Config.s_OperServ, "%s used CHANKILL on %s (%s)", u->nick, channel, realreason); } else - notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, channel); + notice_lang(Config.s_OperServ, u, CHAN_X_NOT_IN_USE, channel); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_CHANKILL); + notice_help(Config.s_OperServ, u, OPER_HELP_CHANKILL); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "CHANKILL", OPER_CHANKILL_SYNTAX); + syntax_error(Config.s_OperServ, u, "CHANKILL", OPER_CHANKILL_SYNTAX); } }; @@ -115,7 +115,7 @@ class OSChanKill : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANKILL); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_CHANKILL); } }; diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c index 823b3fade..7adaf8c42 100644 --- a/src/core/os_chanlist.c +++ b/src/core/os_chanlist.c @@ -39,7 +39,7 @@ class CommandOSChanList : public Command { struct u_chanlist *uc; - notice_lang(s_OperServ, u, OPER_CHANLIST_HEADER_USER, u2->nick); + notice_lang(Config.s_OperServ, u, OPER_CHANLIST_HEADER_USER, u2->nick); for (uc = u2->chans; uc; uc = uc->next) { @@ -52,7 +52,7 @@ class CommandOSChanList : public Command } } - notice_lang(s_OperServ, u, OPER_CHANLIST_RECORD, uc->chan->name, uc->chan->usercount, chan_get_modes(uc->chan, 1, 1), uc->chan->topic ? uc->chan->topic : ""); + notice_lang(Config.s_OperServ, u, OPER_CHANLIST_RECORD, uc->chan->name, uc->chan->usercount, chan_get_modes(uc->chan, 1, 1), uc->chan->topic ? uc->chan->topic : ""); } } else @@ -60,7 +60,7 @@ class CommandOSChanList : public Command int i; Channel *c; - notice_lang(s_OperServ, u, OPER_CHANLIST_HEADER); + notice_lang(Config.s_OperServ, u, OPER_CHANLIST_HEADER); for (i = 0; i < 1024; ++i) { @@ -76,18 +76,18 @@ class CommandOSChanList : public Command continue; } } - notice_lang(s_OperServ, u, OPER_CHANLIST_RECORD, c->name, c->usercount, chan_get_modes(c, 1, 1), c->topic ? c->topic : ""); + notice_lang(Config.s_OperServ, u, OPER_CHANLIST_RECORD, c->name, c->usercount, chan_get_modes(c, 1, 1), c->topic ? c->topic : ""); } } } - notice_lang(s_OperServ, u, OPER_CHANLIST_END); + notice_lang(Config.s_OperServ, u, OPER_CHANLIST_END); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_CHANLIST); + notice_help(Config.s_OperServ, u, OPER_HELP_CHANLIST); return true; } }; @@ -107,7 +107,7 @@ class OSChanList : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANLIST); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_CHANLIST); } }; diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c index f7c5d83ec..2c3658570 100644 --- a/src/core/os_clearmodes.c +++ b/src/core/os_clearmodes.c @@ -34,12 +34,12 @@ class CommandOSClearModes : public Command if (!(c = findchan(chan))) { - notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_OperServ, u, CHAN_X_NOT_IN_USE, chan); return MOD_CONT; } else if (c->bouncy_modes) { - notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE); + notice_lang(Config.s_OperServ, u, OPER_BOUNCY_MODES_U_LINE); return MOD_CONT; } else @@ -54,8 +54,8 @@ class CommandOSClearModes : public Command } } - if (WallOSClearmodes) - ircdproto->SendGlobops(s_OperServ, "%s used CLEARMODES%s on %s", u->nick, all ? " ALL" : "", chan); + if (Config.WallOSClearmodes) + ircdproto->SendGlobops(Config.s_OperServ, "%s used CLEARMODES%s on %s", u->nick, all ? " ALL" : "", chan); if (all) { /* Clear mode +o */ @@ -69,8 +69,8 @@ class CommandOSClearModes : public Command argv[0] = "-o"; argv[1] = cu->user->nick; if (!ircd->svsmode_ucmode) - ircdproto->SendMode(findbot(s_OperServ), c->name, "-o %s", cu->user->nick); - chan_set_modes(s_OperServ, c, 2, argv, 0); + ircdproto->SendMode(findbot(Config.s_OperServ), c->name, "-o %s", cu->user->nick); + chan_set_modes(Config.s_OperServ, c, 2, argv, 0); } /* Clear mode +v */ @@ -84,8 +84,8 @@ class CommandOSClearModes : public Command argv[0] = "-v"; argv[1] = cu->user->nick; if (!ircd->svsmode_ucmode) - ircdproto->SendMode(findbot(s_OperServ), c->name, "-v %s", cu->user->nick); - chan_set_modes(s_OperServ, c, 2, argv, 0); + ircdproto->SendMode(findbot(Config.s_OperServ), c->name, "-v %s", cu->user->nick); + chan_set_modes(Config.s_OperServ, c, 2, argv, 0); } /* Clear mode +h */ @@ -101,8 +101,8 @@ class CommandOSClearModes : public Command argv[0] = "-h"; argv[1] = cu->user->nick; if (!ircd->svsmode_ucmode) - ircdproto->SendMode(findbot(s_OperServ), c->name, "-h %s", cu->user->nick); - chan_set_modes(s_OperServ, c, 2, argv, 0); + ircdproto->SendMode(findbot(Config.s_OperServ), c->name, "-h %s", cu->user->nick); + chan_set_modes(Config.s_OperServ, c, 2, argv, 0); } } @@ -122,8 +122,8 @@ class CommandOSClearModes : public Command argv[0] = buf.c_str(); argv[1] = cu->user->nick; if (!ircd->svsmode_ucmode) - ircdproto->SendMode(findbot(s_OperServ), c->name, "%s %s", buf.c_str(), cu->user->nick); - chan_set_modes(s_OperServ, c, 2, argv, 0); + ircdproto->SendMode(findbot(Config.s_OperServ), c->name, "%s %s", buf.c_str(), cu->user->nick); + chan_set_modes(Config.s_OperServ, c, 2, argv, 0); } } @@ -143,37 +143,37 @@ class CommandOSClearModes : public Command argv[0] = buf.c_str(); argv[1] = cu->user->nick; if (!ircd->svsmode_ucmode) - ircdproto->SendMode(findbot(s_OperServ), c->name, "%s %s", buf.c_str(), cu->user->nick); - chan_set_modes(s_OperServ, c, 2, argv, 0); + ircdproto->SendMode(findbot(Config.s_OperServ), c->name, "%s %s", buf.c_str(), cu->user->nick); + chan_set_modes(Config.s_OperServ, c, 2, argv, 0); } } } - c->ClearModes(s_OperServ); + c->ClearModes(Config.s_OperServ); - c->ClearBans(s_OperServ); - c->ClearExcepts(s_OperServ); - c->ClearInvites(s_OperServ); + c->ClearBans(Config.s_OperServ); + c->ClearExcepts(Config.s_OperServ); + c->ClearInvites(Config.s_OperServ); } if (all) - notice_lang(s_OperServ, u, OPER_CLEARMODES_ALL_DONE, chan); + notice_lang(Config.s_OperServ, u, OPER_CLEARMODES_ALL_DONE, chan); else - notice_lang(s_OperServ, u, OPER_CLEARMODES_DONE, chan); + notice_lang(Config.s_OperServ, u, OPER_CLEARMODES_DONE, chan); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_CLEARMODES); + notice_help(Config.s_OperServ, u, OPER_HELP_CLEARMODES); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "CLEARMODES", OPER_CLEARMODES_SYNTAX); + syntax_error(Config.s_OperServ, u, "CLEARMODES", OPER_CLEARMODES_SYNTAX); } }; @@ -192,7 +192,7 @@ class OSClearModes : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_CLEARMODES); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_CLEARMODES); } }; diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c index 044eb54ac..2ab97058a 100644 --- a/src/core/os_defcon.c +++ b/src/core/os_defcon.c @@ -28,26 +28,26 @@ class DefConTimeout : public Timer int level; public: - DefConTimeout(int newlevel) : Timer(DefConTimeOut), level(newlevel) { } + DefConTimeout(int newlevel) : Timer(Config.DefConTimeOut), level(newlevel) { } void Tick(time_t) { - if (DefConLevel != level) + if (Config.DefConLevel != level) { - DefConLevel = level; + Config.DefConLevel = level; FOREACH_MOD(I_OnDefconLevel, OnDefconLevel(level)); alog("Defcon level timeout, returning to lvl %d", level); - ircdproto->SendGlobops(s_OperServ, getstring(OPER_DEFCON_WALL), s_OperServ, level); + ircdproto->SendGlobops(Config.s_OperServ, getstring(OPER_DEFCON_WALL), Config.s_OperServ, level); - if (GlobalOnDefcon) + if (Config.GlobalOnDefcon) { - if (DefConOffMessage) - oper_global(NULL, "%s", DefConOffMessage); + if (Config.DefConOffMessage) + oper_global(NULL, "%s", Config.DefConOffMessage); else - oper_global(NULL, getstring(DEFCON_GLOBAL), DefConLevel); + oper_global(NULL, getstring(DEFCON_GLOBAL), Config.DefConLevel); - if (GlobalOnDefconMore && !DefConOffMessage) - oper_global(NULL, "%s", DefconMessage); + if (Config.GlobalOnDefconMore && !Config.DefConOffMessage) + oper_global(NULL, "%s", Config.DefconMessage); } runDefCon(); @@ -70,7 +70,7 @@ class CommandOSDEFCON : public Command if (!lvl) { - notice_lang(s_OperServ, u, OPER_DEFCON_CHANGED, DefConLevel); + notice_lang(Config.s_OperServ, u, OPER_DEFCON_CHANGED, Config.DefConLevel); defcon_sendlvls(u); return MOD_CONT; } @@ -80,7 +80,7 @@ class CommandOSDEFCON : public Command this->OnSyntaxError(u, ""); return MOD_CONT; } - DefConLevel = newLevel; + Config.DefConLevel = newLevel; FOREACH_MOD(I_OnDefconLevel, OnDefconLevel(newLevel)); @@ -90,26 +90,26 @@ class CommandOSDEFCON : public Command timeout = NULL; } - if (DefConTimeOut) + if (Config.DefConTimeOut) timeout = new DefConTimeout(5); - notice_lang(s_OperServ, u, OPER_DEFCON_CHANGED, DefConLevel); + notice_lang(Config.s_OperServ, u, OPER_DEFCON_CHANGED, Config.DefConLevel); defcon_sendlvls(u); alog("Defcon level changed to %d by Oper %s", newLevel, u->nick); - ircdproto->SendGlobops(s_OperServ, getstring(OPER_DEFCON_WALL), u->nick, newLevel); + ircdproto->SendGlobops(Config.s_OperServ, getstring(OPER_DEFCON_WALL), u->nick, newLevel); /* Global notice the user what is happening. Also any Message that the Admin would like to add. Set in config file. */ - if (GlobalOnDefcon) + if (Config.GlobalOnDefcon) { - if (DefConLevel == 5 && DefConOffMessage) - oper_global(NULL, "%s", DefConOffMessage); + if (Config.DefConLevel == 5 && Config.DefConOffMessage) + oper_global(NULL, "%s", Config.DefConOffMessage); else - oper_global(NULL, langglobal, DefConLevel); + oper_global(NULL, langglobal, Config.DefConLevel); } - if (GlobalOnDefconMore) + if (Config.GlobalOnDefconMore) { - if (!DefConOffMessage || DefConLevel != 5) - oper_global(NULL, "%s", DefconMessage); + if (!Config.DefConOffMessage || Config.DefConLevel != 5) + oper_global(NULL, "%s", Config.DefconMessage); } /* Run any defcon functions, e.g. FORCE CHAN MODE */ runDefCon(); @@ -118,13 +118,13 @@ class CommandOSDEFCON : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_DEFCON); + notice_help(Config.s_OperServ, u, OPER_HELP_DEFCON); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "DEFCON", OPER_DEFCON_SYNTAX); + syntax_error(Config.s_OperServ, u, "DEFCON", OPER_DEFCON_SYNTAX); } }; @@ -137,7 +137,7 @@ class OSDEFCON : public Module this->SetVersion("$Id$"); this->SetType(CORE); - if (!DefConLevel) + if (!Config.DefConLevel) { throw ModuleException("Invalid configuration settings"); } @@ -147,12 +147,12 @@ class OSDEFCON : public Module this->AddCommand(OPERSERV, new CommandOSDEFCON()); - defconParseModeString(DefConChanModes); + defconParseModeString(Config.DefConChanModes); } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_DEFCON); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_DEFCON); } EventReturn OnPreUserConnect(User *u) @@ -165,14 +165,14 @@ class OSDEFCON : public Module { mask = "*@" + std::string(u->host); alog("DEFCON: adding akill for %s", mask.c_str()); - add_akill(NULL, mask.c_str(), s_OperServ, - time(NULL) + DefConAKILL, - DefConAkillReason ? DefConAkillReason : + add_akill(NULL, mask.c_str(), Config.s_OperServ, + time(NULL) + Config.DefConAKILL, + Config.DefConAkillReason ? Config.DefConAkillReason : "DEFCON AKILL"); } if (CheckDefCon(DEFCON_NO_NEW_CLIENTS) || CheckDefCon(DEFCON_AKILL_NEW_CLIENTS)) - kill_user(s_OperServ, u->nick, DefConAkillReason); + kill_user(Config.s_OperServ, u->nick, Config.DefConAkillReason); return EVENT_STOP; } @@ -187,7 +187,7 @@ class OSDEFCON : public Module if (CheckDefCon(DEFCON_FORCE_CHAN_MODES) && cm && DefConModesOff.HasFlag(Name)) { c->RemoveMode(Name); - ircdproto->SendMode(findbot(s_OperServ), c->name, "-%c", cm->ModeChar); + ircdproto->SendMode(findbot(Config.s_OperServ), c->name, "-%c", cm->ModeChar); } } @@ -209,7 +209,7 @@ class OSDEFCON : public Module else c->SetMode(Name); - ircdproto->SendMode(findbot(s_OperServ), c->name, buf.c_str()); + ircdproto->SendMode(findbot(Config.s_OperServ), c->name, buf.c_str()); } } @@ -235,7 +235,7 @@ class OSDEFCON : public Module EventReturn OnPreCommand(User *u, const std::string &service, const ci::string &command, const std::vector<ci::string> ¶ms) { - if (service == s_NickServ) + if (service == Config.s_NickServ) { if (command == "SET") { @@ -243,7 +243,7 @@ class OSDEFCON : public Module { if (CheckDefCon(DEFCON_NO_MLOCK_CHANGE)) { - notice_lang(s_ChanServ, u, OPER_DEFCON_DENIED); + notice_lang(Config.s_ChanServ, u, OPER_DEFCON_DENIED); return EVENT_STOP; } } @@ -252,29 +252,29 @@ class OSDEFCON : public Module { if (CheckDefCon(DEFCON_NO_NEW_NICKS)) { - notice_lang(s_NickServ, u, OPER_DEFCON_DENIED); + notice_lang(Config.s_NickServ, u, OPER_DEFCON_DENIED); return EVENT_STOP; } } } - else if (service == s_ChanServ) + else if (service == Config.s_ChanServ) { if (command == "REGISTER") { if (CheckDefCon(DEFCON_NO_NEW_CHANNELS)) { - notice_lang(s_ChanServ, u, OPER_DEFCON_DENIED); + notice_lang(Config.s_ChanServ, u, OPER_DEFCON_DENIED); return EVENT_STOP; } } } - else if (service == s_MemoServ) + else if (service == Config.s_MemoServ) { if (command == "SEND" || command == "SENDALL") { if (CheckDefCon(DEFCON_NO_NEW_MEMOS)) { - notice_lang(s_MemoServ, u, OPER_DEFCON_DENIED); + notice_lang(Config.s_MemoServ, u, OPER_DEFCON_DENIED); return EVENT_STOP; } } @@ -290,21 +290,21 @@ class OSDEFCON : public Module if (CheckDefCon(DEFCON_REDUCE_SESSION) && !exception) { - if (session && session->count > DefConSessionLimit) + if (session && session->count > Config.DefConSessionLimit) { - if (SessionLimitExceeded) - ircdproto->SendMessage(findbot(s_OperServ), u->nick, SessionLimitExceeded, u->host); - if (SessionLimitDetailsLoc) - ircdproto->SendMessage(findbot(s_OperServ), u->nick, "%s", SessionLimitDetailsLoc); + if (Config.SessionLimitExceeded) + ircdproto->SendMessage(findbot(Config.s_OperServ), u->nick, Config.SessionLimitExceeded, u->host); + if (Config.SessionLimitDetailsLoc) + ircdproto->SendMessage(findbot(Config.s_OperServ), u->nick, "%s", Config.SessionLimitDetailsLoc); - kill_user(s_OperServ, u->nick, "Session limit exceeded"); + kill_user(Config.s_OperServ, u->nick, "Session limit exceeded"); session->hits++; - if (MaxSessionKill && session->hits >= MaxSessionKill) + if (Config.MaxSessionKill && session->hits >= Config.MaxSessionKill) { char akillmask[BUFSIZE]; snprintf(akillmask, sizeof(akillmask), "*@%s", u->host); - add_akill(NULL, akillmask, s_OperServ, time(NULL) + SessionAutoKillExpiry, "Session limit exceeded"); - ircdproto->SendGlobops(s_OperServ, "Added a temporary AKILL for \2%s\2 due to excessive connections", akillmask); + add_akill(NULL, akillmask, Config.s_OperServ, time(NULL) + Config.SessionAutoKillExpiry, "Session limit exceeded"); + ircdproto->SendGlobops(Config.s_OperServ, "Added a temporary AKILL for \2%s\2 due to excessive connections", akillmask); } } } @@ -312,16 +312,16 @@ class OSDEFCON : public Module void OnChannelModeAdd(ChannelMode *cm) { - if (DefConChanModes) + if (Config.DefConChanModes) { - std::string modes = DefConChanModes; + std::string modes = Config.DefConChanModes; if (modes.find(cm->ModeChar) != std::string::npos) { /* New mode has been added to Anope, check to see if defcon * requires it */ - defconParseModeString(DefConChanModes); + defconParseModeString(Config.DefConChanModes); } } } @@ -334,11 +334,11 @@ class OSDEFCON : public Module if (CheckDefCon(DEFCON_FORCE_CHAN_MODES)) { - myModes = sstrdup(DefConChanModes); + myModes = sstrdup(Config.DefConChanModes); ac = split_buf(myModes, &av, 1); - ircdproto->SendMode(findbot(s_OperServ), c->name, "%s", DefConChanModes); - chan_set_modes(s_OperServ, c, ac, av, 1); + ircdproto->SendMode(findbot(Config.s_OperServ), c->name, "%s", Config.DefConChanModes); + chan_set_modes(Config.s_OperServ, c, ac, av, 1); free(av); delete [] myModes; @@ -352,25 +352,25 @@ class OSDEFCON : public Module void defcon_sendlvls(User *u) { if (CheckDefCon(DEFCON_NO_NEW_CHANNELS)) - notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_CHANNELS); + notice_lang(Config.s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_CHANNELS); if (CheckDefCon(DEFCON_NO_NEW_NICKS)) - notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_NICKS); + notice_lang(Config.s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_NICKS); if (CheckDefCon(DEFCON_NO_MLOCK_CHANGE)) - notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_MLOCK_CHANGE); - if (CheckDefCon(DEFCON_FORCE_CHAN_MODES) && DefConChanModes) - notice_lang(s_OperServ, u, OPER_HELP_DEFCON_FORCE_CHAN_MODES, DefConChanModes); + notice_lang(Config.s_OperServ, u, OPER_HELP_DEFCON_NO_MLOCK_CHANGE); + if (CheckDefCon(DEFCON_FORCE_CHAN_MODES) && Config.DefConChanModes) + notice_lang(Config.s_OperServ, u, OPER_HELP_DEFCON_FORCE_CHAN_MODES, Config.DefConChanModes); if (CheckDefCon(DEFCON_REDUCE_SESSION)) - notice_lang(s_OperServ, u, OPER_HELP_DEFCON_REDUCE_SESSION, DefConSessionLimit); + notice_lang(Config.s_OperServ, u, OPER_HELP_DEFCON_REDUCE_SESSION, Config.DefConSessionLimit); if (CheckDefCon(DEFCON_NO_NEW_CLIENTS)) - notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_CLIENTS); + notice_lang(Config.s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_CLIENTS); if (CheckDefCon(DEFCON_OPER_ONLY)) - notice_lang(s_OperServ, u, OPER_HELP_DEFCON_OPER_ONLY); + notice_lang(Config.s_OperServ, u, OPER_HELP_DEFCON_OPER_ONLY); if (CheckDefCon(DEFCON_SILENT_OPER_ONLY)) - notice_lang(s_OperServ, u, OPER_HELP_DEFCON_SILENT_OPER_ONLY); + notice_lang(Config.s_OperServ, u, OPER_HELP_DEFCON_SILENT_OPER_ONLY); if (CheckDefCon(DEFCON_AKILL_NEW_CLIENTS)) - notice_lang(s_OperServ, u, OPER_HELP_DEFCON_AKILL_NEW_CLIENTS); + notice_lang(Config.s_OperServ, u, OPER_HELP_DEFCON_AKILL_NEW_CLIENTS); if (CheckDefCon(DEFCON_NO_NEW_MEMOS)) - notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_MEMOS); + notice_lang(Config.s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_MEMOS); } void runDefCon() @@ -379,24 +379,24 @@ void runDefCon() if (CheckDefCon(DEFCON_FORCE_CHAN_MODES)) { - if (DefConChanModes && !DefConModesSet) + if (Config.DefConChanModes && !DefConModesSet) { - if (DefConChanModes[0] == '+' || DefConChanModes[0] == '-') + if (Config.DefConChanModes[0] == '+' || Config.DefConChanModes[0] == '-') { - alog("DEFCON: setting %s on all chan's", DefConChanModes); + alog("DEFCON: setting %s on all chan's", Config.DefConChanModes); DefConModesSet = 1; - do_mass_mode(DefConChanModes); + do_mass_mode(Config.DefConChanModes); } } } else { - if (DefConChanModes && (DefConModesSet != 0)) + if (Config.DefConChanModes && (DefConModesSet != 0)) { - if (DefConChanModes[0] == '+' || DefConChanModes[0] == '-') + if (Config.DefConChanModes[0] == '+' || Config.DefConChanModes[0] == '-') { DefConModesSet = 0; - if ((newmodes = defconReverseModes(DefConChanModes))) + if ((newmodes = defconReverseModes(Config.DefConChanModes))) { alog("DEFCON: setting %s on all chan's", newmodes); do_mass_mode(newmodes); diff --git a/src/core/os_global.c b/src/core/os_global.c index fe9ccb161..447c5fd5c 100644 --- a/src/core/os_global.c +++ b/src/core/os_global.c @@ -26,21 +26,21 @@ class CommandOSGlobal : public Command { const char *msg = params[0].c_str(); - if (WallOSGlobal) - ircdproto->SendGlobops(s_OperServ, "\2%s\2 just used GLOBAL command.", u->nick); + if (Config.WallOSGlobal) + ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 just used GLOBAL command.", u->nick); oper_global(u->nick, "%s", msg); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_GLOBAL, s_GlobalNoticer); + notice_help(Config.s_OperServ, u, OPER_HELP_GLOBAL, Config.s_GlobalNoticer); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "GLOBAL", OPER_GLOBAL_SYNTAX); + syntax_error(Config.s_OperServ, u, "GLOBAL", OPER_GLOBAL_SYNTAX); } }; @@ -59,7 +59,7 @@ class OSGlobal : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_GLOBAL); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_GLOBAL); } }; diff --git a/src/core/os_help.c b/src/core/os_help.c index 626d5ed5b..884f5b1ba 100644 --- a/src/core/os_help.c +++ b/src/core/os_help.c @@ -24,15 +24,15 @@ class CommandOSHelp : public Command CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { - mod_help_cmd(s_OperServ, u, OPERSERV, params[0].c_str()); + mod_help_cmd(Config.s_OperServ, u, OPERSERV, params[0].c_str()); return MOD_CONT; } void OnSyntaxError(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP); + notice_help(Config.s_OperServ, u, OPER_HELP); FOREACH_MOD(I_OnOperServHelp, OnOperServHelp(u)); - notice_help(s_OperServ, u, OPER_HELP_LOGGED); + notice_help(Config.s_OperServ, u, OPER_HELP_LOGGED); } }; diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c index da6ef13db..bd7487f36 100644 --- a/src/core/os_ignore.c +++ b/src/core/os_ignore.c @@ -35,18 +35,18 @@ class CommandOSIgnore : public Command if (t <= -1) { - notice_lang(s_OperServ, u, OPER_IGNORE_VALID_TIME); + notice_lang(Config.s_OperServ, u, OPER_IGNORE_VALID_TIME); return MOD_CONT; } else if (!t) { add_ignore(nick, t); - notice_lang(s_OperServ, u, OPER_IGNORE_PERM_DONE, nick); + notice_lang(Config.s_OperServ, u, OPER_IGNORE_PERM_DONE, nick); } else { add_ignore(nick, t); - notice_lang(s_OperServ, u, OPER_IGNORE_TIME_DONE, nick, time); + notice_lang(Config.s_OperServ, u, OPER_IGNORE_TIME_DONE, nick, time); } } @@ -59,13 +59,13 @@ class CommandOSIgnore : public Command if (!ignore) { - notice_lang(s_OperServ, u, OPER_IGNORE_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_IGNORE_LIST_EMPTY); return MOD_CONT; } - notice_lang(s_OperServ, u, OPER_IGNORE_LIST); + notice_lang(Config.s_OperServ, u, OPER_IGNORE_LIST); for (id = ignore; id; id = id->next) - u->SendMessage(s_OperServ, "%s", id->mask); + u->SendMessage(Config.s_OperServ, "%s", id->mask); return MOD_CONT; } @@ -79,10 +79,10 @@ class CommandOSIgnore : public Command { if (delete_ignore(nick)) { - notice_lang(s_OperServ, u, OPER_IGNORE_DEL_DONE, nick); + notice_lang(Config.s_OperServ, u, OPER_IGNORE_DEL_DONE, nick); return MOD_CONT; } - notice_lang(s_OperServ, u, OPER_IGNORE_LIST_NOMATCH, nick); + notice_lang(Config.s_OperServ, u, OPER_IGNORE_LIST_NOMATCH, nick); } return MOD_CONT; @@ -91,7 +91,7 @@ class CommandOSIgnore : public Command CommandReturn DoClear(User *u) { clear_ignores(); - notice_lang(s_OperServ, u, OPER_IGNORE_LIST_CLEARED); + notice_lang(Config.s_OperServ, u, OPER_IGNORE_LIST_CLEARED); return MOD_CONT; } @@ -120,13 +120,13 @@ class CommandOSIgnore : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_IGNORE); + notice_help(Config.s_OperServ, u, OPER_HELP_IGNORE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX); + syntax_error(Config.s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX); } }; @@ -144,7 +144,7 @@ class OSIgnore : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_IGNORE); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_IGNORE); } }; diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c index 31f33d47a..9c809c670 100644 --- a/src/core/os_jupe.c +++ b/src/core/os_jupe.c @@ -29,9 +29,9 @@ class CommandOSJupe : public Command Server *server = findserver(servlist, jserver); if (!isValidHost(jserver, 3)) - notice_lang(s_OperServ, u, OPER_JUPE_HOST_ERROR); + notice_lang(Config.s_OperServ, u, OPER_JUPE_HOST_ERROR); else if (server && (server->HasFlag(SERVER_ISME) || server->HasFlag(SERVER_ISUPLINK))) - notice_lang(s_OperServ, u, OPER_JUPE_INVALID_SERVER); + notice_lang(Config.s_OperServ, u, OPER_JUPE_INVALID_SERVER); else { char rbuf[256]; snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", u->nick, reason ? ": " : "", reason ? reason : ""); @@ -40,21 +40,21 @@ class CommandOSJupe : public Command Server *juped_server = new_server(me_server, jserver, rbuf, SERVER_JUPED, ircd->ts6 ? ts6_sid_retrieve() : NULL); ircdproto->SendServer(juped_server); - if (WallOSJupe) - ircdproto->SendGlobops(s_OperServ, "\2%s\2 used JUPE on \2%s\2", u->nick, jserver); + if (Config.WallOSJupe) + ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 used JUPE on \2%s\2", u->nick, jserver); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_JUPE); + notice_help(Config.s_OperServ, u, OPER_HELP_JUPE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "JUPE", OPER_JUPE_SYNTAX); + syntax_error(Config.s_OperServ, u, "JUPE", OPER_JUPE_SYNTAX); } }; @@ -73,7 +73,7 @@ class OSJupe : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_JUPE); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_JUPE); } }; diff --git a/src/core/os_kick.c b/src/core/os_kick.c index 52428d66b..724a12c79 100644 --- a/src/core/os_kick.c +++ b/src/core/os_kick.c @@ -30,21 +30,21 @@ class CommandOSKick : public Command if (!(c = findchan(chan))) { - notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_OperServ, u, CHAN_X_NOT_IN_USE, chan); return MOD_CONT; } else if (c->bouncy_modes) { - notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE); + notice_lang(Config.s_OperServ, u, OPER_BOUNCY_MODES_U_LINE); return MOD_CONT; } - ircdproto->SendKick(findbot(s_OperServ), chan, nick, "%s (%s)", u->nick, s); - if (WallOSKick) - ircdproto->SendGlobops(s_OperServ, "%s used KICK on %s/%s", u->nick, nick, chan); + ircdproto->SendKick(findbot(Config.s_OperServ), chan, nick, "%s (%s)", u->nick, s); + if (Config.WallOSKick) + ircdproto->SendGlobops(Config.s_OperServ, "%s used KICK on %s/%s", u->nick, nick, chan); argv[0] = sstrdup(chan); argv[1] = sstrdup(nick); argv[2] = sstrdup(s); - do_kick(s_OperServ, 3, argv); + do_kick(Config.s_OperServ, 3, argv); delete [] argv[2]; delete [] argv[1]; delete [] argv[0]; @@ -53,13 +53,13 @@ class CommandOSKick : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_KICK); + notice_help(Config.s_OperServ, u, OPER_HELP_KICK); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "KICK", OPER_KICK_SYNTAX); + syntax_error(Config.s_OperServ, u, "KICK", OPER_KICK_SYNTAX); } }; @@ -78,7 +78,7 @@ class OSKick : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_KICK); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_KICK); } }; diff --git a/src/core/os_mode.c b/src/core/os_mode.c index 088657876..6984c73f7 100644 --- a/src/core/os_mode.c +++ b/src/core/os_mode.c @@ -30,32 +30,32 @@ class CommandOSMode : public Command Channel *c; if (!(c = findchan(chan))) - notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_OperServ, u, CHAN_X_NOT_IN_USE, chan); else if (c->bouncy_modes) - notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE); + notice_lang(Config.s_OperServ, u, OPER_BOUNCY_MODES_U_LINE); else { - ircdproto->SendMode(findbot(s_OperServ), chan, "%s", modes); + ircdproto->SendMode(findbot(Config.s_OperServ), chan, "%s", modes); ac = split_buf(const_cast<char *>(modes), /* XXX */ &av, 1); - chan_set_modes(s_OperServ, c, ac, av, -1); + chan_set_modes(Config.s_OperServ, c, ac, av, -1); free(av); - if (WallOSMode) - ircdproto->SendGlobops(s_OperServ, "%s used MODE %s on %s", u->nick, modes, chan); + if (Config.WallOSMode) + ircdproto->SendGlobops(Config.s_OperServ, "%s used MODE %s on %s", u->nick, modes, chan); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_MODE); + notice_help(Config.s_OperServ, u, OPER_HELP_MODE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "MODE", OPER_MODE_SYNTAX); + syntax_error(Config.s_OperServ, u, "MODE", OPER_MODE_SYNTAX); } }; @@ -74,7 +74,7 @@ class OSMode : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_MODE); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_MODE); } }; diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c index 8f5e4cd99..1906175d0 100644 --- a/src/core/os_modinfo.c +++ b/src/core/os_modinfo.c @@ -37,7 +37,7 @@ class CommandOSModInfo : public Command { tm = *localtime(&m->created); strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, &tm); - notice_lang(s_OperServ, u, OPER_MODULE_INFO_LIST, m->name.c_str(), !m->version.empty() ? m->version.c_str() : "?", !m->author.empty() ? m->author.c_str() : "?", timebuf); + notice_lang(Config.s_OperServ, u, OPER_MODULE_INFO_LIST, m->name.c_str(), !m->version.empty() ? m->version.c_str() : "?", !m->author.empty() ? m->author.c_str() : "?", timebuf); for (idx = 0; idx < MAX_CMD_HASH; ++idx) { showModuleCmdLoaded(HOSTSERV[idx], m->name.c_str(), u); @@ -49,19 +49,19 @@ class CommandOSModInfo : public Command } } else - notice_lang(s_OperServ, u, OPER_MODULE_NO_INFO, file); + notice_lang(Config.s_OperServ, u, OPER_MODULE_NO_INFO, file); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_MODINFO); + notice_help(Config.s_OperServ, u, OPER_HELP_MODINFO); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "MODINFO", OPER_MODULE_INFO_SYNTAX); + syntax_error(Config.s_OperServ, u, "MODINFO", OPER_MODULE_INFO_SYNTAX); } }; @@ -79,7 +79,7 @@ class OSModInfo : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_MODINFO); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_MODINFO); } }; @@ -95,7 +95,7 @@ int showModuleCmdLoaded(CommandHash *cmdList, const char *mod_name, User *u) { if (c->mod_name && !stricmp(c->mod_name, mod_name)) { - notice_lang(s_OperServ, u, OPER_MODULE_CMD_LIST, c->service, c->name.c_str()); + notice_lang(Config.s_OperServ, u, OPER_MODULE_CMD_LIST, c->service, c->name.c_str()); ++display; } } diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c index f2b82b678..1e159e551 100644 --- a/src/core/os_modlist.c +++ b/src/core/os_modlist.c @@ -101,7 +101,7 @@ class CommandOSModList : public Command } } - notice_lang(s_OperServ, u, OPER_MODULE_LIST_HEADER); + notice_lang(Config.s_OperServ, u, OPER_MODULE_LIST_HEADER); for (idx = 0; idx != MAX_CMD_HASH; ++idx) { @@ -112,58 +112,58 @@ class CommandOSModList : public Command case CORE: if (showCore) { - notice_lang(s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), core); + notice_lang(Config.s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), core); ++count; } break; case THIRD: if (showThird) { - notice_lang(s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), third); + notice_lang(Config.s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), third); ++count; } break; case PROTOCOL: if (showProto) { - notice_lang(s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), proto); + notice_lang(Config.s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), proto); ++count; } break; case SUPPORTED: if (showSupported) { - notice_lang(s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), supported); + notice_lang(Config.s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), supported); ++count; } break; case QATESTED: if (showQA) { - notice_lang(s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), qa); + notice_lang(Config.s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), qa); ++count; } break; case ENCRYPTION: if (showEnc) { - notice_lang(s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), enc); + notice_lang(Config.s_OperServ, u, OPER_MODULE_LIST, current->name, current->m->version.c_str(), enc); ++count; } } } } if (!count) - notice_lang(s_OperServ, u, OPER_MODULE_NO_LIST); + notice_lang(Config.s_OperServ, u, OPER_MODULE_NO_LIST); else - notice_lang(s_OperServ, u, OPER_MODULE_LIST_FOOTER, count); + notice_lang(Config.s_OperServ, u, OPER_MODULE_LIST_FOOTER, count); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_MODLIST); + notice_help(Config.s_OperServ, u, OPER_HELP_MODLIST); return true; } }; @@ -183,7 +183,7 @@ class OSModList : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLIST); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_MODLIST); } }; diff --git a/src/core/os_modload.c b/src/core/os_modload.c index 4e4e6d384..84514d93c 100644 --- a/src/core/os_modload.c +++ b/src/core/os_modload.c @@ -29,14 +29,14 @@ class CommandOSModLoad : public Command Module *m = findModule(name); if (m) { - notice_lang(s_OperServ, u, OPER_MODULE_ALREADY_LOADED, name); + notice_lang(Config.s_OperServ, u, OPER_MODULE_ALREADY_LOADED, name); return MOD_CONT; } int status = ModuleManager::LoadModule(name, u); if (status != MOD_ERR_OK) { - notice_lang(s_OperServ, u, OPER_MODULE_LOAD_FAIL, name); + notice_lang(Config.s_OperServ, u, OPER_MODULE_LOAD_FAIL, name); } return MOD_CONT; @@ -44,13 +44,13 @@ class CommandOSModLoad : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_MODLOAD); + notice_help(Config.s_OperServ, u, OPER_HELP_MODLOAD); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "MODLOAD", OPER_MODULE_LOAD_SYNTAX); + syntax_error(Config.s_OperServ, u, "MODLOAD", OPER_MODULE_LOAD_SYNTAX); } }; @@ -70,7 +70,7 @@ class OSModLoad : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLOAD); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_MODLOAD); } }; diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c index 4d6aeb733..a006e0fc2 100644 --- a/src/core/os_modunload.c +++ b/src/core/os_modunload.c @@ -30,7 +30,7 @@ class CommandOSModUnLoad : public Command Module *m = findModule(name); if (!m) { - notice_lang(s_OperServ, u, OPER_MODULE_ISNT_LOADED, name); + notice_lang(Config.s_OperServ, u, OPER_MODULE_ISNT_LOADED, name); return MOD_CONT; } @@ -39,20 +39,20 @@ class CommandOSModUnLoad : public Command status = ModuleManager::UnloadModule(m, u); if (status != MOD_ERR_OK) - notice_lang(s_OperServ, u, OPER_MODULE_REMOVE_FAIL, name); + notice_lang(Config.s_OperServ, u, OPER_MODULE_REMOVE_FAIL, name); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_MODUNLOAD); + notice_help(Config.s_OperServ, u, OPER_HELP_MODUNLOAD); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "MODUNLOAD", OPER_MODULE_UNLOAD_SYNTAX); + syntax_error(Config.s_OperServ, u, "MODUNLOAD", OPER_MODULE_UNLOAD_SYNTAX); } }; @@ -72,7 +72,7 @@ class OSModUnLoad : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_MODUNLOAD); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_MODUNLOAD); } }; diff --git a/src/core/os_news.c b/src/core/os_news.c index 6720dd026..e2cf52538 100644 --- a/src/core/os_news.c +++ b/src/core/os_news.c @@ -80,7 +80,7 @@ struct newsmsgs msgarray[] = { #define SAFE(x) do { \ if ((x) < 0) { \ if (!forceload) \ - fatal("Read error on %s", NewsDBName); \ + fatal("Read error on %s", Config.NewsDBName); \ break; \ } \ } while (0) @@ -94,7 +94,7 @@ void load_news() NewsItem *news; char *text; - if (!(f = open_db(s_OperServ, NewsDBName, "r", NEWS_VERSION))) + if (!(f = open_db(Config.s_OperServ, Config.NewsDBName, "r", NEWS_VERSION))) return; switch (i = get_file_version(f)) { case 9: @@ -123,7 +123,7 @@ void load_news() break; default: - fatal("Unsupported version (%d) on %s", i, NewsDBName); + fatal("Unsupported version (%d) on %s", i, Config.NewsDBName); } /* switch (ver) */ close_db(f); @@ -134,9 +134,9 @@ void load_news() #define SAFE(x) do { \ if ((x) < 0) { \ restore_db(f); \ - log_perror("Write error on %s", NewsDBName); \ - if (time(NULL) - lastwarn > WarningTimeout) { \ - ircdproto->SendGlobops(NULL, "Write error on %s: %s", NewsDBName, \ + log_perror("Write error on %s", Config.NewsDBName); \ + if (time(NULL) - lastwarn > Config.WarningTimeout) { \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", Config.NewsDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -149,7 +149,7 @@ void save_news() dbFILE *f; static time_t lastwarn = 0; - if (!(f = open_db(s_OperServ, NewsDBName, "w", NEWS_VERSION))) + if (!(f = open_db(Config.s_OperServ, Config.NewsDBName, "w", NEWS_VERSION))) return; SAFE(write_int16(News.size(), f)); for (unsigned i = 0; i < News.size(); i++) { @@ -197,7 +197,7 @@ static void DisplayNews(User *u, NewsType Type) tm = localtime(&News[i]->time); strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, tm); - notice_lang(s_GlobalNoticer, u, msg, timebuf, News[i]->Text.c_str()); + notice_lang(Config.s_GlobalNoticer, u, msg, timebuf, News[i]->Text.c_str()); ++displayed; @@ -206,7 +206,7 @@ static void DisplayNews(User *u, NewsType Type) current_news = i; return; } - else if (displayed >= NewsCount) + else if (displayed >= Config.NewsCount) return; } @@ -284,17 +284,17 @@ class NewsBase : public Command if (News[i]->type == type) { if (!count) - notice_lang(s_OperServ, u, msgs[MSG_LIST_HEADER]); + notice_lang(Config.s_OperServ, u, msgs[MSG_LIST_HEADER]); tm = localtime(&News[i]->time); strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_OperServ, u, msgs[MSG_LIST_ENTRY], News[i]->num, timebuf, *News[i]->who ? News[i]->who : "<unknown>", News[i]->Text.c_str()); + notice_lang(Config.s_OperServ, u, msgs[MSG_LIST_ENTRY], News[i]->num, timebuf, *News[i]->who ? News[i]->who : "<unknown>", News[i]->Text.c_str()); ++count; } } if (!count) - notice_lang(s_OperServ, u, msgs[MSG_LIST_NONE]); + notice_lang(Config.s_OperServ, u, msgs[MSG_LIST_NONE]); else - notice_lang(s_OperServ, u, END_OF_ANY_LIST, "News"); + notice_lang(Config.s_OperServ, u, END_OF_ANY_LIST, "News"); return MOD_CONT; } @@ -310,14 +310,14 @@ class NewsBase : public Command { if (readonly) { - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); return MOD_CONT; } n = add_newsitem(u, text, type); if (n < 0) - notice_lang(s_OperServ, u, msgs[MSG_ADD_FULL]); + notice_lang(Config.s_OperServ, u, msgs[MSG_ADD_FULL]); else - notice_lang(s_OperServ, u, msgs[MSG_ADDED], n); + notice_lang(Config.s_OperServ, u, msgs[MSG_ADDED], n); } return MOD_CONT; @@ -334,7 +334,7 @@ class NewsBase : public Command { if (readonly) { - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); return MOD_CONT; } if (stricmp(text, "ALL")) @@ -342,7 +342,7 @@ class NewsBase : public Command num = atoi(text); if (num > 0 && del_newsitem(num, type)) { - notice_lang(s_OperServ, u, msgs[MSG_DELETED], num); + notice_lang(Config.s_OperServ, u, msgs[MSG_DELETED], num); for (unsigned i = 0; i < News.size(); ++i) { if (News[i]->type == type && News[i]->num > num) @@ -350,14 +350,14 @@ class NewsBase : public Command } } else - notice_lang(s_OperServ, u, msgs[MSG_DEL_NOT_FOUND], num); + notice_lang(Config.s_OperServ, u, msgs[MSG_DEL_NOT_FOUND], num); } else { if (del_newsitem(0, type)) - notice_lang(s_OperServ, u, msgs[MSG_DELETED_ALL]); + notice_lang(Config.s_OperServ, u, msgs[MSG_DELETED_ALL]); else - notice_lang(s_OperServ, u, msgs[MSG_DEL_NONE]); + notice_lang(Config.s_OperServ, u, msgs[MSG_DEL_NONE]); } } @@ -418,13 +418,13 @@ class CommandOSLogonNews : public NewsBase bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, NEWS_HELP_LOGON, NewsCount); + notice_help(Config.s_OperServ, u, NEWS_HELP_LOGON, Config.NewsCount); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "LOGONNEWS", NEWS_LOGON_SYNTAX); + syntax_error(Config.s_OperServ, u, "LOGONNEWS", NEWS_LOGON_SYNTAX); } }; @@ -442,13 +442,13 @@ class CommandOSOperNews : public NewsBase bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, NEWS_HELP_OPER, NewsCount); + notice_help(Config.s_OperServ, u, NEWS_HELP_OPER, Config.NewsCount); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "OPERNEWS", NEWS_OPER_SYNTAX); + syntax_error(Config.s_OperServ, u, "OPERNEWS", NEWS_OPER_SYNTAX); } }; @@ -466,13 +466,13 @@ class CommandOSRandomNews : public NewsBase bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, NEWS_HELP_RANDOM); + notice_help(Config.s_OperServ, u, NEWS_HELP_RANDOM); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "RANDOMNEWS", NEWS_RANDOM_SYNTAX); + syntax_error(Config.s_OperServ, u, "RANDOMNEWS", NEWS_RANDOM_SYNTAX); } }; @@ -500,9 +500,9 @@ class OSNews : public Module void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_LOGONNEWS); - notice_lang(s_OperServ, u, OPER_HELP_CMD_OPERNEWS); - notice_lang(s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_LOGONNEWS); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_OPERNEWS); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS); } void OnUserModeSet(User *u, UserModeName Name) diff --git a/src/core/os_noop.c b/src/core/os_noop.c index ce0be71cd..91194b02b 100644 --- a/src/core/os_noop.c +++ b/src/core/os_noop.c @@ -37,22 +37,22 @@ class CommandOSNOOP : public Command ircdproto->SendSVSNOOP(server, 1); snprintf(reason, sizeof(reason), "NOOP command used by %s", u->nick); - if (WallOSNoOp) - ircdproto->SendGlobops(s_OperServ, "\2%s\2 used NOOP on \2%s\2", u->nick, server); - notice_lang(s_OperServ, u, OPER_NOOP_SET, server); + if (Config.WallOSNoOp) + ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 used NOOP on \2%s\2", u->nick, server); + notice_lang(Config.s_OperServ, u, OPER_NOOP_SET, server); /* Kill all the IRCops of the server */ for (u2 = firstuser(); u2; u2 = u3) { u3 = nextuser(); if (u2 && is_oper(u2) && u2->server->name && Anope::Match(u2->server->name, server, true)) - kill_user(s_OperServ, u2->nick, reason); + kill_user(Config.s_OperServ, u2->nick, reason); } } else if (cmd == "REVOKE") { ircdproto->SendSVSNOOP(server, 0); - notice_lang(s_OperServ, u, OPER_NOOP_REVOKE, server); + notice_lang(Config.s_OperServ, u, OPER_NOOP_REVOKE, server); } else this->OnSyntaxError(u, ""); @@ -61,13 +61,13 @@ class CommandOSNOOP : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_NOOP); + notice_help(Config.s_OperServ, u, OPER_HELP_NOOP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "NOOP", OPER_NOOP_SYNTAX); + syntax_error(Config.s_OperServ, u, "NOOP", OPER_NOOP_SYNTAX); } }; @@ -86,7 +86,7 @@ class OSNOOP : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_NOOP); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_NOOP); } }; diff --git a/src/core/os_oline.c b/src/core/os_oline.c index e97a3818c..b96f1451f 100644 --- a/src/core/os_oline.c +++ b/src/core/os_oline.c @@ -30,20 +30,20 @@ class CommandOSOLine : public Command /* let's check whether the user is online */ if (!(u2 = finduser(nick))) - notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick); + notice_lang(Config.s_OperServ, u, NICK_X_NOT_IN_USE, nick); else if (u2 && flag[0] == '+') { - ircdproto->SendSVSO(s_OperServ, nick, flag); + ircdproto->SendSVSO(Config.s_OperServ, nick, flag); common_svsmode(u2, "+o", NULL); - notice_lang(s_OperServ, u2, OPER_OLINE_IRCOP); - notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flag, nick); - ircdproto->SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s", u->nick, nick); + notice_lang(Config.s_OperServ, u2, OPER_OLINE_IRCOP); + notice_lang(Config.s_OperServ, u, OPER_OLINE_SUCCESS, flag, nick); + ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 used OLINE for %s", u->nick, nick); } else if (u2 && flag[0] == '-') { - ircdproto->SendSVSO(s_OperServ, nick, flag); - notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flag, nick); - ircdproto->SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s", u->nick, nick); + ircdproto->SendSVSO(Config.s_OperServ, nick, flag); + notice_lang(Config.s_OperServ, u, OPER_OLINE_SUCCESS, flag, nick); + ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 used OLINE for %s", u->nick, nick); } else this->OnSyntaxError(u, ""); @@ -52,13 +52,13 @@ class CommandOSOLine : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_OLINE); + notice_help(Config.s_OperServ, u, OPER_HELP_OLINE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "OLINE", OPER_OLINE_SYNTAX); + syntax_error(Config.s_OperServ, u, "OLINE", OPER_OLINE_SYNTAX); } }; @@ -80,7 +80,7 @@ class OSOLine : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_OLINE); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_OLINE); } }; diff --git a/src/core/os_quit.c b/src/core/os_quit.c index 995eab2cd..825208a41 100644 --- a/src/core/os_quit.c +++ b/src/core/os_quit.c @@ -31,15 +31,15 @@ class CommandOSQuit : public Command else sprintf(const_cast<char *>(quitmsg), "QUIT command received from %s", u->nick); // XXX we know this is safe, but.. - if (GlobalOnCycle) - oper_global(NULL, "%s", GlobalOnCycleMessage); + if (Config.GlobalOnCycle) + oper_global(NULL, "%s", Config.GlobalOnCycleMessage); quitting = 1; return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_QUIT); + notice_help(Config.s_OperServ, u, OPER_HELP_QUIT); return true; } }; @@ -59,7 +59,7 @@ class OSQuit : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_QUIT); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_QUIT); } }; diff --git a/src/core/os_reload.c b/src/core/os_reload.c index e241d28a4..52479023a 100644 --- a/src/core/os_reload.c +++ b/src/core/os_reload.c @@ -35,13 +35,13 @@ class CommandOSReload : public Command } FOREACH_MOD(I_OnReload, OnReload(false)); - notice_lang(s_OperServ, u, OPER_RELOAD); + notice_lang(Config.s_OperServ, u, OPER_RELOAD); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_RELOAD); + notice_help(Config.s_OperServ, u, OPER_HELP_RELOAD); return true; } }; @@ -61,7 +61,7 @@ class OSReload : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_RELOAD); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_RELOAD); } }; diff --git a/src/core/os_restart.c b/src/core/os_restart.c index 5dfe7d034..716bd16d6 100644 --- a/src/core/os_restart.c +++ b/src/core/os_restart.c @@ -30,8 +30,8 @@ class CommandOSRestart : public Command else sprintf(const_cast<char *>(quitmsg), /* XXX */ "RESTART command received from %s", u->nick); - if (GlobalOnCycle) - oper_global(NULL, "%s", GlobalOnCycleMessage); + if (Config.GlobalOnCycle) + oper_global(NULL, "%s", Config.GlobalOnCycleMessage); /* raise(SIGHUP); */ do_restart_services(); return MOD_CONT; @@ -39,7 +39,7 @@ class CommandOSRestart : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_RESTART); + notice_help(Config.s_OperServ, u, OPER_HELP_RESTART); return true; } }; @@ -58,7 +58,7 @@ class OSRestart : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_RESTART); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_RESTART); } }; diff --git a/src/core/os_session.c b/src/core/os_session.c index 2a1cde0b2..7c515cd0b 100644 --- a/src/core/os_session.c +++ b/src/core/os_session.c @@ -25,17 +25,17 @@ class CommandOSSession : public Command const char *param = params[1].c_str(); if ((mincount = atoi(param)) <= 1) - notice_lang(s_OperServ, u, OPER_SESSION_INVALID_THRESHOLD); + notice_lang(Config.s_OperServ, u, OPER_SESSION_INVALID_THRESHOLD); else { - notice_lang(s_OperServ, u, OPER_SESSION_LIST_HEADER, mincount); - notice_lang(s_OperServ, u, OPER_SESSION_LIST_COLHEAD); + notice_lang(Config.s_OperServ, u, OPER_SESSION_LIST_HEADER, mincount); + notice_lang(Config.s_OperServ, u, OPER_SESSION_LIST_COLHEAD); for (i = 0; i < 1024; ++i) { for (session = sessionlist[i]; session; session = session->next) { if (session->count >= mincount) - notice_lang(s_OperServ, u, OPER_SESSION_LIST_FORMAT, session->count, session->host); + notice_lang(Config.s_OperServ, u, OPER_SESSION_LIST_FORMAT, session->count, session->host); } } } @@ -49,10 +49,10 @@ class CommandOSSession : public Command Session *session = findsession(param); if (!session) - notice_lang(s_OperServ, u, OPER_SESSION_NOT_FOUND, param); + notice_lang(Config.s_OperServ, u, OPER_SESSION_NOT_FOUND, param); else { Exception *exception = find_host_exception(param); - notice_lang(s_OperServ, u, OPER_SESSION_VIEW_FORMAT, param, session->count, exception ? exception-> limit : DefSessionLimit); + notice_lang(Config.s_OperServ, u, OPER_SESSION_VIEW_FORMAT, param, session->count, exception ? exception-> limit : Config.DefSessionLimit); } return MOD_CONT; @@ -66,9 +66,9 @@ class CommandOSSession : public Command { ci::string cmd = params[0]; - if (!LimitSessions) + if (!Config.LimitSessions) { - notice_lang(s_OperServ, u, OPER_SESSION_DISABLED); + notice_lang(Config.s_OperServ, u, OPER_SESSION_DISABLED); return MOD_CONT; } @@ -83,13 +83,13 @@ class CommandOSSession : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_SESSION); + notice_help(Config.s_OperServ, u, OPER_HELP_SESSION); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "SESSION", OPER_SESSION_LIST_SYNTAX); + syntax_error(Config.s_OperServ, u, "SESSION", OPER_SESSION_LIST_SYNTAX); } }; @@ -134,11 +134,11 @@ static int exception_list(User *u, const int index, int *sent_header) if (index < 0 || index >= nexceptions) return 0; if (!*sent_header) { - notice_lang(s_OperServ, u, OPER_EXCEPTION_LIST_HEADER); - notice_lang(s_OperServ, u, OPER_EXCEPTION_LIST_COLHEAD); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_LIST_HEADER); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_LIST_COLHEAD); *sent_header = 1; } - notice_lang(s_OperServ, u, OPER_EXCEPTION_LIST_FORMAT, index + 1, exceptions[index].limit, exceptions[index].mask); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_LIST_FORMAT, index + 1, exceptions[index].limit, exceptions[index].mask); return 1; } @@ -158,7 +158,7 @@ static int exception_view(User *u, const int index, int *sent_header) if (index < 0 || index >= nexceptions) return 0; if (!*sent_header) { - notice_lang(s_OperServ, u, OPER_EXCEPTION_LIST_HEADER); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_LIST_HEADER); *sent_header = 1; } @@ -167,7 +167,7 @@ static int exception_view(User *u, const int index, int *sent_header) expire_left(u->nc, expirebuf, sizeof(expirebuf), exceptions[index].expires); - notice_lang(s_OperServ, u, OPER_EXCEPTION_VIEW_FORMAT, index + 1, exceptions[index].mask, *exceptions[index].who ? exceptions[index].who : "<unknown>", timebuf, expirebuf, exceptions[index].limit, exceptions[index].reason); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_VIEW_FORMAT, index + 1, exceptions[index].mask, *exceptions[index].who ? exceptions[index].who : "<unknown>", timebuf, expirebuf, exceptions[index].limit, exceptions[index].reason); return 1; } @@ -190,7 +190,7 @@ class CommandOSException : public Command if (nexceptions >= 32767) { - notice_lang(s_OperServ, u, OPER_EXCEPTION_TOO_MANY); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_TOO_MANY); return MOD_CONT; } @@ -219,10 +219,10 @@ class CommandOSException : public Command return MOD_CONT; } - time_t expires = expiry ? dotime(expiry) : ExceptionExpiry; + time_t expires = expiry ? dotime(expiry) : Config.ExceptionExpiry; if (expires < 0) { - notice_lang(s_OperServ, u, BAD_EXPIRY_TIME); + notice_lang(Config.s_OperServ, u, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -230,26 +230,26 @@ class CommandOSException : public Command int limit = limitstr && isdigit(*limitstr) ? atoi(limitstr) : -1; - if (limit < 0 || limit > static_cast<int>(MaxSessionLimit)) + if (limit < 0 || limit > static_cast<int>(Config.MaxSessionLimit)) { - notice_lang(s_OperServ, u, OPER_EXCEPTION_INVALID_LIMIT, MaxSessionLimit); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_INVALID_LIMIT, Config.MaxSessionLimit); return MOD_CONT; } else { if (strchr(mask, '!') || strchr(mask, '@')) { - notice_lang(s_OperServ, u, OPER_EXCEPTION_INVALID_HOSTMASK); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_INVALID_HOSTMASK); return MOD_CONT; } x = exception_add(u, mask, limit, reason, u->nick, expires); if (x == 1) - notice_lang(s_OperServ, u, OPER_EXCEPTION_ADDED, mask, limit); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_ADDED, mask, limit); if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); } return MOD_CONT; @@ -273,14 +273,14 @@ class CommandOSException : public Command if (!deleted) { if (count == 1) - notice_lang(s_OperServ, u, OPER_EXCEPTION_NO_SUCH_ENTRY, last); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_NO_SUCH_ENTRY, last); else - notice_lang(s_OperServ, u, OPER_EXCEPTION_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_NO_MATCH); } else if (deleted == 1) - notice_lang(s_OperServ, u, OPER_EXCEPTION_DELETED_ONE); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_DELETED_ONE); else - notice_lang(s_OperServ, u, OPER_EXCEPTION_DELETED_SEVERAL, deleted); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_DELETED_SEVERAL, deleted); } else { @@ -291,13 +291,13 @@ class CommandOSException : public Command if (!stricmp(mask, exceptions[i].mask)) { exception_del(i); - notice_lang(s_OperServ, u, OPER_EXCEPTION_DELETED, mask); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_DELETED, mask); deleted = 1; break; } } if (!deleted && i == nexceptions) - notice_lang(s_OperServ, u, OPER_EXCEPTION_NOT_FOUND, mask); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_NOT_FOUND, mask); } /* Renumber the exception list. I don't believe in having holes in @@ -309,7 +309,7 @@ class CommandOSException : public Command exceptions[i].num = i; if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); return MOD_CONT; } @@ -350,14 +350,14 @@ class CommandOSException : public Command free(exception); - notice_lang(s_OperServ, u, OPER_EXCEPTION_MOVED, exceptions[n1].mask, n1 + 1, n2 + 1); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_MOVED, exceptions[n1].mask, n1 + 1, n2 + 1); /* Renumber the exception list. See DoDel() above for why. */ for (i = 0; i < nexceptions; ++i) exceptions[i].num = i; if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); } else this->OnSyntaxError(u, "MOVE"); @@ -382,7 +382,7 @@ class CommandOSException : public Command } } if (!sent_header) - notice_lang(s_OperServ, u, OPER_EXCEPTION_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_NO_MATCH); return MOD_CONT; } @@ -404,7 +404,7 @@ class CommandOSException : public Command } } if (!sent_header) - notice_lang(s_OperServ, u, OPER_EXCEPTION_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_NO_MATCH); return MOD_CONT; } @@ -417,9 +417,9 @@ class CommandOSException : public Command { ci::string cmd = params[0]; - if (!LimitSessions) + if (!Config.LimitSessions) { - notice_lang(s_OperServ, u, OPER_EXCEPTION_DISABLED); + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_DISABLED); return MOD_CONT; } @@ -440,13 +440,13 @@ class CommandOSException : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_EXCEPTION); + notice_help(Config.s_OperServ, u, OPER_HELP_EXCEPTION); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "EXCEPTION", OPER_EXCEPTION_SYNTAX); + syntax_error(Config.s_OperServ, u, "EXCEPTION", OPER_EXCEPTION_SYNTAX); } }; @@ -466,8 +466,8 @@ class OSSession : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_SESSION); - notice_lang(s_OperServ, u, OPER_HELP_CMD_EXCEPTION); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_SESSION); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_EXCEPTION); } }; diff --git a/src/core/os_set.c b/src/core/os_set.c index eb067a158..01bbd5f5b 100644 --- a/src/core/os_set.c +++ b/src/core/os_set.c @@ -23,15 +23,15 @@ class CommandOSSet : public Command int index; index = allow_ignore ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; - notice_lang(s_OperServ, u, index, "IGNORE"); + notice_lang(Config.s_OperServ, u, index, "IGNORE"); index = readonly ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; - notice_lang(s_OperServ, u, index, "READONLY"); + notice_lang(Config.s_OperServ, u, index, "READONLY"); index = LogChan ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; - notice_lang(s_OperServ, u, index, "LOGCHAN"); + notice_lang(Config.s_OperServ, u, index, "LOGCHAN"); index = debug ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; - notice_lang(s_OperServ, u, index, "DEBUG"); + notice_lang(Config.s_OperServ, u, index, "DEBUG"); index = noexpire ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; - notice_lang(s_OperServ, u, index, "NOEXPIRE"); + notice_lang(Config.s_OperServ, u, index, "NOEXPIRE"); return MOD_CONT; } @@ -49,15 +49,15 @@ class CommandOSSet : public Command if (setting == "ON") { allow_ignore = 1; - notice_lang(s_OperServ, u, OPER_SET_IGNORE_ON); + notice_lang(Config.s_OperServ, u, OPER_SET_IGNORE_ON); } else if (setting == "OFF") { allow_ignore = 0; - notice_lang(s_OperServ, u, OPER_SET_IGNORE_OFF); + notice_lang(Config.s_OperServ, u, OPER_SET_IGNORE_OFF); } else - notice_lang(s_OperServ, u, OPER_SET_IGNORE_ERROR); + notice_lang(Config.s_OperServ, u, OPER_SET_IGNORE_ERROR); return MOD_CONT; } @@ -77,17 +77,17 @@ class CommandOSSet : public Command readonly = 1; alog("Read-only mode activated"); close_log(); - notice_lang(s_OperServ, u, OPER_SET_READONLY_ON); + notice_lang(Config.s_OperServ, u, OPER_SET_READONLY_ON); } else if (setting == "OFF") { readonly = 0; open_log(); alog("Read-only mode deactivated"); - notice_lang(s_OperServ, u, OPER_SET_READONLY_OFF); + notice_lang(Config.s_OperServ, u, OPER_SET_READONLY_OFF); } else - notice_lang(s_OperServ, u, OPER_SET_READONLY_ERROR); + notice_lang(Config.s_OperServ, u, OPER_SET_READONLY_ERROR); return MOD_CONT; } @@ -104,32 +104,32 @@ class CommandOSSet : public Command } /* Unlike the other SET commands where only stricmp is necessary, - * we also have to ensure that LogChannel is defined or we can't + * we also have to ensure that Config.LogChannel is defined or we can't * send to it. * * -jester */ - if (LogChannel && setting == "ON") + if (Config.LogChannel && setting == "ON") { if (ircd->join2msg) { - c = findchan(LogChannel); - ircdproto->SendJoin(findbot(s_GlobalNoticer), LogChannel, c ? c->creation_time : time(NULL)); + c = findchan(Config.LogChannel); + ircdproto->SendJoin(findbot(Config.s_GlobalNoticer), Config.LogChannel, c ? c->creation_time : time(NULL)); } LogChan = true; - alog("Now sending log messages to %s", LogChannel); - notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_ON, LogChannel); + alog("Now sending log messages to %s", Config.LogChannel); + notice_lang(Config.s_OperServ, u, OPER_SET_LOGCHAN_ON, Config.LogChannel); } - else if (LogChannel && setting == "OFF") + else if (Config.LogChannel && setting == "OFF") { alog("No longer sending log messages to a channel"); if (ircd->join2msg) - ircdproto->SendPart(findbot(s_GlobalNoticer), LogChannel, NULL); + ircdproto->SendPart(findbot(Config.s_GlobalNoticer), Config.LogChannel, NULL); LogChan = false; - notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_OFF); + notice_lang(Config.s_OperServ, u, OPER_SET_LOGCHAN_OFF); } else - notice_lang(s_OperServ, u, OPER_SET_LOGCHAN_ERROR); + notice_lang(Config.s_OperServ, u, OPER_SET_LOGCHAN_ERROR); return MOD_CONT; } @@ -149,24 +149,24 @@ class CommandOSSet : public Command * * Rob **/ - if (!SuperAdmin) - notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_NOT_ENABLED); + if (!Config.SuperAdmin) + notice_lang(Config.s_OperServ, u, OPER_SUPER_ADMIN_NOT_ENABLED); else if (setting == "ON") { u->isSuperAdmin = 1; - notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ON); - alog("%s: %s is a SuperAdmin ", s_OperServ, u->nick); - ircdproto->SendGlobops(s_OperServ, getstring(OPER_SUPER_ADMIN_WALL_ON), u->nick); + notice_lang(Config.s_OperServ, u, OPER_SUPER_ADMIN_ON); + alog("%s: %s is a SuperAdmin ", Config.s_OperServ, u->nick); + ircdproto->SendGlobops(Config.s_OperServ, getstring(OPER_SUPER_ADMIN_WALL_ON), u->nick); } else if (setting == "OFF") { u->isSuperAdmin = 0; - notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_OFF); - alog("%s: %s is no longer a SuperAdmin", s_OperServ, u->nick); - ircdproto->SendGlobops(s_OperServ, getstring(OPER_SUPER_ADMIN_WALL_OFF), u->nick); + notice_lang(Config.s_OperServ, u, OPER_SUPER_ADMIN_OFF); + alog("%s: %s is no longer a SuperAdmin", Config.s_OperServ, u->nick); + ircdproto->SendGlobops(Config.s_OperServ, getstring(OPER_SUPER_ADMIN_WALL_OFF), u->nick); } else - notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_SYNTAX); + notice_lang(Config.s_OperServ, u, OPER_SUPER_ADMIN_SYNTAX); return MOD_CONT; } @@ -185,22 +185,22 @@ class CommandOSSet : public Command { debug = 1; alog("Debug mode activated"); - notice_lang(s_OperServ, u, OPER_SET_DEBUG_ON); + notice_lang(Config.s_OperServ, u, OPER_SET_DEBUG_ON); } else if (setting == "OFF" || (setting[0] == '0' && !atoi(setting.c_str()))) { alog("Debug mode deactivated"); debug = 0; - notice_lang(s_OperServ, u, OPER_SET_DEBUG_OFF); + notice_lang(Config.s_OperServ, u, OPER_SET_DEBUG_OFF); } else if (isdigit(setting[0]) && atoi(setting.c_str()) > 0) { debug = atoi(setting.c_str()); alog("Debug mode activated (level %d)", debug); - notice_lang(s_OperServ, u, OPER_SET_DEBUG_LEVEL, debug); + notice_lang(Config.s_OperServ, u, OPER_SET_DEBUG_LEVEL, debug); } else - notice_lang(s_OperServ, u, OPER_SET_DEBUG_ERROR); + notice_lang(Config.s_OperServ, u, OPER_SET_DEBUG_ERROR); return MOD_CONT; } @@ -219,16 +219,16 @@ class CommandOSSet : public Command { noexpire = 1; alog("No expire mode activated"); - notice_lang(s_OperServ, u, OPER_SET_NOEXPIRE_ON); + notice_lang(Config.s_OperServ, u, OPER_SET_NOEXPIRE_ON); } else if (setting == "OFF") { noexpire = 0; alog("No expire mode deactivated"); - notice_lang(s_OperServ, u, OPER_SET_NOEXPIRE_OFF); + notice_lang(Config.s_OperServ, u, OPER_SET_NOEXPIRE_OFF); } else - notice_lang(s_OperServ, u, OPER_SET_NOEXPIRE_ERROR); + notice_lang(Config.s_OperServ, u, OPER_SET_NOEXPIRE_ERROR); return MOD_CONT; } @@ -256,28 +256,28 @@ class CommandOSSet : public Command else if (option == "NOEXPIRE") return this->DoSetNoExpire(u, params); else - notice_lang(s_OperServ, u, OPER_SET_UNKNOWN_OPTION, option.c_str()); + notice_lang(Config.s_OperServ, u, OPER_SET_UNKNOWN_OPTION, option.c_str()); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { if (subcommand.empty()) - notice_help(s_OperServ, u, OPER_HELP_SET); + notice_help(Config.s_OperServ, u, OPER_HELP_SET); else if (subcommand == "LIST") - notice_help(s_OperServ, u, OPER_HELP_SET_LIST); + notice_help(Config.s_OperServ, u, OPER_HELP_SET_LIST); else if (subcommand == "READONLY") - notice_help(s_OperServ, u, OPER_HELP_SET_READONLY); + notice_help(Config.s_OperServ, u, OPER_HELP_SET_READONLY); else if (subcommand == "LOGCHAN") - notice_help(s_OperServ, u, OPER_HELP_SET_LOGCHAN); + notice_help(Config.s_OperServ, u, OPER_HELP_SET_LOGCHAN); else if (subcommand == "DEBUG") - notice_help(s_OperServ, u, OPER_HELP_SET_DEBUG); + notice_help(Config.s_OperServ, u, OPER_HELP_SET_DEBUG); else if (subcommand == "NOEXPIRE") - notice_help(s_OperServ, u, OPER_HELP_SET_NOEXPIRE); + notice_help(Config.s_OperServ, u, OPER_HELP_SET_NOEXPIRE); else if (subcommand == "IGNORE") - notice_help(s_OperServ, u, OPER_HELP_SET_IGNORE); + notice_help(Config.s_OperServ, u, OPER_HELP_SET_IGNORE); else if (subcommand == "SUPERADMIN") - notice_help(s_OperServ, u, OPER_HELP_SET_SUPERADMIN); + notice_help(Config.s_OperServ, u, OPER_HELP_SET_SUPERADMIN); else return false; @@ -286,7 +286,7 @@ class CommandOSSet : public Command void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "SET", OPER_SET_SYNTAX); + syntax_error(Config.s_OperServ, u, "SET", OPER_SET_SYNTAX); } }; @@ -305,7 +305,7 @@ class OSSet : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_SET); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_SET); } }; diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c index 45dd765f0..6f9632eb8 100644 --- a/src/core/os_sgline.c +++ b/src/core/os_sgline.c @@ -42,7 +42,7 @@ class CommandOSSGLine : public Command else expiry = NULL; - expires = expiry ? dotime(expiry) : SGLineExpiry; + expires = expiry ? dotime(expiry) : Config.SGLineExpiry; /* If the expiry given does not contain a final letter, it's in days, * said the doc. Ah well. */ @@ -51,7 +51,7 @@ class CommandOSSGLine : public Command /* Do not allow less than a minute expiry time */ if (expires && expires < 60) { - notice_lang(s_OperServ, u, BAD_EXPIRY_TIME); + notice_lang(Config.s_OperServ, u, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -88,7 +88,7 @@ class CommandOSSGLine : public Command /* We first do some sanity check on the proposed mask. */ if (!mask.empty() && strspn(cmask, "*?") == strlen(cmask)) { - notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, cmask); + notice_lang(Config.s_OperServ, u, USERHOST_MASK_TOO_WIDE, cmask); return MOD_CONT; } @@ -96,10 +96,10 @@ class CommandOSSGLine : public Command if (deleted < 0) return MOD_CONT; else if (deleted) - notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL, deleted); - notice_lang(s_OperServ, u, OPER_SGLINE_ADDED, cmask); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL, deleted); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_ADDED, cmask); - if (WallOSSGLine) + if (Config.WallOSSGLine) { char buf[128]; @@ -129,11 +129,11 @@ class CommandOSSGLine : public Command snprintf(buf, sizeof(buf), "expires in %d %s%s", wall_expiry, s, wall_expiry == 1 ? "" : "s"); } - ircdproto->SendGlobops(s_OperServ, "%s added an SGLINE for %s (%s)", u->nick, cmask, buf); + ircdproto->SendGlobops(Config.s_OperServ, "%s added an SGLINE for %s (%s)", u->nick, cmask, buf); } if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); } else @@ -157,7 +157,7 @@ class CommandOSSGLine : public Command if (!sglines.count) { - notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_LIST_EMPTY); return MOD_CONT; } @@ -167,27 +167,27 @@ class CommandOSSGLine : public Command res = slist_delete_range(&sglines, mask, NULL); if (!res) { - notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_NO_MATCH); return MOD_CONT; } else if (res == 1) - notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_ONE); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_DELETED_ONE); else - notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL, res); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL, res); } else { if ((res = slist_indexof(&sglines, const_cast<char *>(mask))) == -1) { - notice_lang(s_OperServ, u, OPER_SGLINE_NOT_FOUND, mask); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_NOT_FOUND, mask); return MOD_CONT; } slist_delete(&sglines, res); - notice_lang(s_OperServ, u, OPER_SGLINE_DELETED, mask); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_DELETED, mask); } if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); return MOD_CONT; } @@ -198,7 +198,7 @@ class CommandOSSGLine : public Command int res, sent_header = 0; if (!sglines.count) { - notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_LIST_EMPTY); return MOD_CONT; } @@ -209,7 +209,7 @@ class CommandOSSGLine : public Command res = slist_enum(&sglines, mask, &sgline_list_callback, u, &sent_header); if (!res) { - notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_NO_MATCH); return MOD_CONT; } } @@ -226,9 +226,9 @@ class CommandOSSGLine : public Command } if (!sent_header) - notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_NO_MATCH); else - notice_lang(s_OperServ, u, END_OF_ANY_LIST, "SGLine"); + notice_lang(Config.s_OperServ, u, END_OF_ANY_LIST, "SGLine"); } return MOD_CONT; @@ -241,7 +241,7 @@ class CommandOSSGLine : public Command if (!sglines.count) { - notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_LIST_EMPTY); return MOD_CONT; } @@ -252,7 +252,7 @@ class CommandOSSGLine : public Command res = slist_enum(&sglines, mask, &sgline_view_callback, u, &sent_header); if (!res) { - notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_NO_MATCH); return MOD_CONT; } } @@ -269,7 +269,7 @@ class CommandOSSGLine : public Command } if (!sent_header) - notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_NO_MATCH); } return MOD_CONT; @@ -278,7 +278,7 @@ class CommandOSSGLine : public Command CommandReturn OnClear(User *u) { slist_clear(&sglines, 1); - notice_lang(s_OperServ, u, OPER_SGLINE_CLEAR); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_CLEAR); return MOD_CONT; } @@ -308,13 +308,13 @@ class CommandOSSGLine : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_SGLINE); + notice_help(Config.s_OperServ, u, OPER_HELP_SGLINE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX); + syntax_error(Config.s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX); } }; @@ -337,7 +337,7 @@ class OSSGLine : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_SGLINE); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_SGLINE); } }; @@ -352,14 +352,14 @@ int sgline_view(int number, SXLine *sx, User *u, int *sent_header) if (!*sent_header) { - notice_lang(s_OperServ, u, OPER_SGLINE_VIEW_HEADER); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_VIEW_HEADER); *sent_header = 1; } tm = *localtime(&sx->seton); strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); expire_left(u->nc, expirebuf, sizeof(expirebuf), sx->expires); - notice_lang(s_OperServ, u, OPER_SGLINE_VIEW_FORMAT, number, sx->mask, sx->by, timebuf, expirebuf, sx->reason); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_VIEW_FORMAT, number, sx->mask, sx->by, timebuf, expirebuf, sx->reason); return 1; } @@ -381,11 +381,11 @@ int sgline_list(int number, SXLine *sx, User *u, int *sent_header) if (!*sent_header) { - notice_lang(s_OperServ, u, OPER_SGLINE_LIST_HEADER); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_LIST_HEADER); *sent_header = 1; } - notice_lang(s_OperServ, u, OPER_SGLINE_LIST_FORMAT, number, sx->mask, sx->reason); + notice_lang(Config.s_OperServ, u, OPER_SGLINE_LIST_FORMAT, number, sx->mask, sx->reason); return 1; } diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c index a1934ffc9..e2039c498 100644 --- a/src/core/os_shutdown.c +++ b/src/core/os_shutdown.c @@ -31,8 +31,8 @@ class CommandOSShutdown : public Command else sprintf(const_cast<char *>(quitmsg), /* XXX */ "SHUTDOWN command received from %s", u->nick); - if (GlobalOnCycle) - oper_global(NULL, "%s", GlobalOnCycleMessage); + if (Config.GlobalOnCycle) + oper_global(NULL, "%s", Config.GlobalOnCycleMessage); save_data = 1; delayed_quit = 1; return MOD_CONT; @@ -40,7 +40,7 @@ class CommandOSShutdown : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_SHUTDOWN); + notice_help(Config.s_OperServ, u, OPER_HELP_SHUTDOWN); return true; } }; @@ -60,7 +60,7 @@ class OSShutdown : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_SHUTDOWN); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_SHUTDOWN); } }; diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c index f1436d018..b4018bcd0 100644 --- a/src/core/os_sqline.c +++ b/src/core/os_sqline.c @@ -41,7 +41,7 @@ class CommandOSSQLine : public Command else expiry = NULL; - expires = expiry ? dotime(expiry) : SQLineExpiry; + expires = expiry ? dotime(expiry) : Config.SQLineExpiry; /* If the expiry given does not contain a final letter, it's in days, * said the doc. Ah well. */ @@ -50,7 +50,7 @@ class CommandOSSQLine : public Command /* Do not allow less than a minute expiry time */ if (expires != 0 && expires < 60) { - notice_lang(s_OperServ, u, BAD_EXPIRY_TIME); + notice_lang(Config.s_OperServ, u, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -67,14 +67,14 @@ class CommandOSSQLine : public Command /* We first do some sanity check on the proposed mask. */ if (strspn(mask, "*") == strlen(mask)) { - notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask); + notice_lang(Config.s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask); return MOD_CONT; } /* Channel SQLINEs are only supported on Bahamut servers */ if (*mask == '#' && !ircd->chansqline) { - notice_lang(s_OperServ, u, OPER_SQLINE_CHANNELS_UNSUPPORTED); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_CHANNELS_UNSUPPORTED); return MOD_CONT; } @@ -82,10 +82,10 @@ class CommandOSSQLine : public Command if (deleted < 0) return MOD_CONT; else if (deleted) - notice_lang(s_OperServ, u, OPER_SQLINE_DELETED_SEVERAL, deleted); - notice_lang(s_OperServ, u, OPER_SQLINE_ADDED, mask); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_DELETED_SEVERAL, deleted); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_ADDED, mask); - if (WallOSSQLine) + if (Config.WallOSSQLine) { char buf[128]; @@ -115,11 +115,11 @@ class CommandOSSQLine : public Command snprintf(buf, sizeof(buf), "expires in %d %s%s", wall_expiry, s, wall_expiry == 1 ? "" : "s"); } - ircdproto->SendGlobops(s_OperServ, "%s added an SQLINE for %s (%s)", u->nick, mask, buf); + ircdproto->SendGlobops(Config.s_OperServ, "%s added an SQLINE for %s (%s)", u->nick, mask, buf); } if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); } else @@ -143,7 +143,7 @@ class CommandOSSQLine : public Command if (!sqlines.count) { - notice_lang(s_OperServ, u, OPER_SQLINE_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_LIST_EMPTY); return MOD_CONT; } @@ -153,27 +153,27 @@ class CommandOSSQLine : public Command res = slist_delete_range(&sqlines, mask, NULL); if (!res) { - notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_NO_MATCH); return MOD_CONT; } else if (res == 1) - notice_lang(s_OperServ, u, OPER_SQLINE_DELETED_ONE); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_DELETED_ONE); else - notice_lang(s_OperServ, u, OPER_SQLINE_DELETED_SEVERAL, res); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_DELETED_SEVERAL, res); } else { if ((res = slist_indexof(&sqlines, const_cast<char *>(mask))) == -1) { - notice_lang(s_OperServ, u, OPER_SQLINE_NOT_FOUND, mask); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_NOT_FOUND, mask); return MOD_CONT; } slist_delete(&sqlines, res); - notice_lang(s_OperServ, u, OPER_SQLINE_DELETED, mask); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_DELETED, mask); } if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); return MOD_CONT; } @@ -185,7 +185,7 @@ class CommandOSSQLine : public Command if (!sqlines.count) { - notice_lang(s_OperServ, u, OPER_SQLINE_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_LIST_EMPTY); return MOD_CONT; } @@ -196,7 +196,7 @@ class CommandOSSQLine : public Command res = slist_enum(&sqlines, mask, &sqline_list_callback, u, &sent_header); if (!res) { - notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_NO_MATCH); return MOD_CONT; } } @@ -213,9 +213,9 @@ class CommandOSSQLine : public Command } if (!sent_header) - notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_NO_MATCH); else - notice_lang(s_OperServ, u, END_OF_ANY_LIST, "SQLine"); + notice_lang(Config.s_OperServ, u, END_OF_ANY_LIST, "SQLine"); } return MOD_CONT; @@ -228,7 +228,7 @@ class CommandOSSQLine : public Command if (!sqlines.count) { - notice_lang(s_OperServ, u, OPER_SQLINE_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_LIST_EMPTY); return MOD_CONT; } @@ -239,7 +239,7 @@ class CommandOSSQLine : public Command res = slist_enum(&sqlines, mask, &sqline_view_callback, u, &sent_header); if (!res) { - notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_NO_MATCH); return MOD_CONT; } } @@ -256,7 +256,7 @@ class CommandOSSQLine : public Command } if (!sent_header) - notice_lang(s_OperServ, u, OPER_SQLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_NO_MATCH); } return MOD_CONT; @@ -265,7 +265,7 @@ class CommandOSSQLine : public Command CommandReturn DoClear(User *u) { slist_clear(&sqlines, 1); - notice_lang(s_OperServ, u, OPER_SQLINE_CLEAR); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_CLEAR); return MOD_CONT; } @@ -295,13 +295,13 @@ class CommandOSSQLine : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_SQLINE); + notice_help(Config.s_OperServ, u, OPER_HELP_SQLINE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "SQLINE", OPER_SQLINE_SYNTAX); + syntax_error(Config.s_OperServ, u, "SQLINE", OPER_SQLINE_SYNTAX); } }; @@ -323,7 +323,7 @@ class OSSQLine : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_SQLINE); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_SQLINE); } }; @@ -337,14 +337,14 @@ int sqline_view(int number, SXLine *sx, User *u, int *sent_header) if (!*sent_header) { - notice_lang(s_OperServ, u, OPER_SQLINE_VIEW_HEADER); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_VIEW_HEADER); *sent_header = 1; } tm = *localtime(&sx->seton); strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); expire_left(u->nc, expirebuf, sizeof(expirebuf), sx->expires); - notice_lang(s_OperServ, u, OPER_SQLINE_VIEW_FORMAT, number, sx->mask, sx->by, timebuf, expirebuf, sx->reason); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_VIEW_FORMAT, number, sx->mask, sx->by, timebuf, expirebuf, sx->reason); return 1; } @@ -366,11 +366,11 @@ int sqline_list(int number, SXLine *sx, User *u, int *sent_header) if (!*sent_header) { - notice_lang(s_OperServ, u, OPER_SQLINE_LIST_HEADER); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_LIST_HEADER); *sent_header = 1; } - notice_lang(s_OperServ, u, OPER_SQLINE_LIST_FORMAT, number, sx->mask, sx->reason); + notice_lang(Config.s_OperServ, u, OPER_SQLINE_LIST_FORMAT, number, sx->mask, sx->reason); return 1; } diff --git a/src/core/os_staff.c b/src/core/os_staff.c index 725444521..4a06fe098 100644 --- a/src/core/os_staff.c +++ b/src/core/os_staff.c @@ -34,9 +34,9 @@ class CommandOSStaff : public Command int i; std::list<std::pair<std::string, std::string> >::iterator it; - notice_lang(s_OperServ, u, OPER_STAFF_LIST_HEADER); + notice_lang(Config.s_OperServ, u, OPER_STAFF_LIST_HEADER); - for (it = svsopers_in_config.begin(); it != svsopers_in_config.end(); ++it) + for (it = Config.Opers.begin(); it != Config.Opers.end(); ++it) { found = 0; std::string nick = it->first, type = it->second; @@ -44,7 +44,7 @@ class CommandOSStaff : public Command if ((au = finduser(nick.c_str()))) { found = 1; - notice_lang(s_OperServ, u, OPER_STAFF_FORMAT, '*', type.c_str(), nick.c_str()); + notice_lang(Config.s_OperServ, u, OPER_STAFF_FORMAT, '*', type.c_str(), nick.c_str()); } else if ((nc = findcore(nick.c_str()))) { @@ -54,22 +54,22 @@ class CommandOSStaff : public Command if ((au = finduser(na->nick))) { found = 1; - notice_lang(s_OperServ, u, OPER_STAFF_AFORMAT, '*', type.c_str(), nick.c_str(), u->nick); + notice_lang(Config.s_OperServ, u, OPER_STAFF_AFORMAT, '*', type.c_str(), nick.c_str(), u->nick); } } } if (!found) - notice_lang(s_OperServ, u, OPER_STAFF_FORMAT, ' ', type.c_str(), nick.c_str()); + notice_lang(Config.s_OperServ, u, OPER_STAFF_FORMAT, ' ', type.c_str(), nick.c_str()); } - notice_lang(s_OperServ, u, END_OF_ANY_LIST, "Staff"); + notice_lang(Config.s_OperServ, u, END_OF_ANY_LIST, "Staff"); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_STAFF); + notice_help(Config.s_OperServ, u, OPER_HELP_STAFF); return true; } }; @@ -89,7 +89,7 @@ class OSStaff : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_STAFF); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_STAFF); } }; diff --git a/src/core/os_stats.c b/src/core/os_stats.c index 9e825ee00..5de32dab0 100644 --- a/src/core/os_stats.c +++ b/src/core/os_stats.c @@ -44,81 +44,81 @@ class CommandOSStats : public Command { int timeout; /* AKILLs */ - notice_lang(s_OperServ, u, OPER_STATS_AKILL_COUNT, akills.count); - timeout = AutokillExpiry + 59; + notice_lang(Config.s_OperServ, u, OPER_STATS_AKILL_COUNT, akills.count); + timeout = Config.AutokillExpiry + 59; if (timeout >= 172800) - notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_DAYS, timeout / 86400); + notice_lang(Config.s_OperServ, u, OPER_STATS_AKILL_EXPIRE_DAYS, timeout / 86400); else if (timeout >= 86400) - notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_DAY); + notice_lang(Config.s_OperServ, u, OPER_STATS_AKILL_EXPIRE_DAY); else if (timeout >= 7200) - notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_HOURS, timeout / 3600); + notice_lang(Config.s_OperServ, u, OPER_STATS_AKILL_EXPIRE_HOURS, timeout / 3600); else if (timeout >= 3600) - notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_HOUR); + notice_lang(Config.s_OperServ, u, OPER_STATS_AKILL_EXPIRE_HOUR); else if (timeout >= 120) - notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_MINS, timeout / 60); + notice_lang(Config.s_OperServ, u, OPER_STATS_AKILL_EXPIRE_MINS, timeout / 60); else if (timeout >= 60) - notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_MIN); + notice_lang(Config.s_OperServ, u, OPER_STATS_AKILL_EXPIRE_MIN); else - notice_lang(s_OperServ, u, OPER_STATS_AKILL_EXPIRE_NONE); + notice_lang(Config.s_OperServ, u, OPER_STATS_AKILL_EXPIRE_NONE); if (ircd->sgline) { /* SGLINEs */ - notice_lang(s_OperServ, u, OPER_STATS_SGLINE_COUNT, sglines.count); - timeout = SGLineExpiry + 59; + notice_lang(Config.s_OperServ, u, OPER_STATS_SGLINE_COUNT, sglines.count); + timeout = Config.SGLineExpiry + 59; if (timeout >= 172800) - notice_lang(s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_DAYS, timeout / 86400); + notice_lang(Config.s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_DAYS, timeout / 86400); else if (timeout >= 86400) - notice_lang(s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_DAY); + notice_lang(Config.s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_DAY); else if (timeout >= 7200) - notice_lang(s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_HOURS, timeout / 3600); + notice_lang(Config.s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_HOURS, timeout / 3600); else if (timeout >= 3600) - notice_lang(s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_HOUR); + notice_lang(Config.s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_HOUR); else if (timeout >= 120) - notice_lang(s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_MINS, timeout / 60); + notice_lang(Config.s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_MINS, timeout / 60); else if (timeout >= 60) - notice_lang(s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_MIN); + notice_lang(Config.s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_MIN); else - notice_lang(s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_NONE); + notice_lang(Config.s_OperServ, u, OPER_STATS_SGLINE_EXPIRE_NONE); } if (ircd->sqline) { /* SQLINEs */ - notice_lang(s_OperServ, u, OPER_STATS_SQLINE_COUNT, sqlines.count); - timeout = SQLineExpiry + 59; + notice_lang(Config.s_OperServ, u, OPER_STATS_SQLINE_COUNT, sqlines.count); + timeout = Config.SQLineExpiry + 59; if (timeout >= 172800) - notice_lang(s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_DAYS, timeout / 86400); + notice_lang(Config.s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_DAYS, timeout / 86400); else if (timeout >= 86400) - notice_lang(s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_DAY); + notice_lang(Config.s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_DAY); else if (timeout >= 7200) - notice_lang(s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_HOURS, timeout / 3600); + notice_lang(Config.s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_HOURS, timeout / 3600); else if (timeout >= 3600) - notice_lang(s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_HOUR); + notice_lang(Config.s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_HOUR); else if (timeout >= 120) - notice_lang(s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_MINS, timeout / 60); + notice_lang(Config.s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_MINS, timeout / 60); else if (timeout >= 60) - notice_lang(s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_MIN); + notice_lang(Config.s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_MIN); else - notice_lang(s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_NONE); + notice_lang(Config.s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_NONE); } if (ircd->szline) { /* SZLINEs */ - notice_lang(s_OperServ, u, OPER_STATS_SZLINE_COUNT, szlines.count); - timeout = SZLineExpiry + 59; + notice_lang(Config.s_OperServ, u, OPER_STATS_SZLINE_COUNT, szlines.count); + timeout = Config.SZLineExpiry + 59; if (timeout >= 172800) - notice_lang(s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_DAYS, timeout / 86400); + notice_lang(Config.s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_DAYS, timeout / 86400); else if (timeout >= 86400) - notice_lang(s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_DAY); + notice_lang(Config.s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_DAY); else if (timeout >= 7200) - notice_lang(s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_HOURS, timeout / 3600); + notice_lang(Config.s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_HOURS, timeout / 3600); else if (timeout >= 3600) - notice_lang(s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_HOUR); + notice_lang(Config.s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_HOUR); else if (timeout >= 120) - notice_lang(s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_MINS, timeout / 60); + notice_lang(Config.s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_MINS, timeout / 60); else if (timeout >= 60) - notice_lang(s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_MIN); + notice_lang(Config.s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_MIN); else - notice_lang(s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_NONE); + notice_lang(Config.s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_NONE); } return MOD_CONT; } @@ -126,7 +126,7 @@ class CommandOSStats : public Command CommandReturn DoStatsReset(User *u) { maxusercnt = usercnt; - notice_lang(s_OperServ, u, OPER_STATS_RESET); + notice_lang(Config.s_OperServ, u, OPER_STATS_RESET); return MOD_CONT; } @@ -135,30 +135,30 @@ class CommandOSStats : public Command char timebuf[64]; time_t uptime = time(NULL) - start_time; int days = uptime / 86400, hours = (uptime / 3600) % 24, mins = (uptime / 60) % 60, secs = uptime % 60; - notice_lang(s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt, opcnt); + notice_lang(Config.s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt, opcnt); struct tm *tm = localtime(&maxusertime); strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_OperServ, u, OPER_STATS_MAX_USERS, maxusercnt, timebuf); + notice_lang(Config.s_OperServ, u, OPER_STATS_MAX_USERS, maxusercnt, timebuf); if (days > 1) - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_DHMS, days, hours, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_DHMS, days, hours, mins, secs); else if (days == 1) - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1DHMS, days, hours, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_1DHMS, days, hours, mins, secs); else { if (hours > 1) { if (mins != 1) { if (secs != 1) - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_HMS, hours, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_HMS, hours, mins, secs); else - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_HM1S, hours, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_HM1S, hours, mins, secs); } else { if (secs != 1) - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_H1MS, hours, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_H1MS, hours, mins, secs); else - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_H1M1S, hours, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_H1M1S, hours, mins, secs); } } else if (hours == 1) @@ -166,16 +166,16 @@ class CommandOSStats : public Command if (mins != 1) { if (secs != 1) - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1HMS, hours, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_1HMS, hours, mins, secs); else - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1HM1S, hours, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_1HM1S, hours, mins, secs); } else { if (secs != 1) - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1H1MS, hours, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_1H1MS, hours, mins, secs); else - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1H1M1S, hours, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_1H1M1S, hours, mins, secs); } } else @@ -183,16 +183,16 @@ class CommandOSStats : public Command if (mins != 1) { if (secs != 1) - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_MS, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_MS, mins, secs); else - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_M1S, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_M1S, mins, secs); } else { if (secs != 1) - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1MS, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_1MS, mins, secs); else - notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1M1S, mins, secs); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPTIME_1M1S, mins, secs); } } } @@ -226,9 +226,9 @@ class CommandOSStats : public Command } } } - notice_lang(s_OperServ, u, OPER_STATS_UPLINK_SERVER, serv_uplink->name); - notice_lang(s_OperServ, u, OPER_STATS_UPLINK_CAPAB, buf); - notice_lang(s_OperServ, u, OPER_STATS_UPLINK_SERVER_COUNT, stats_count_servers(serv_uplink)); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPLINK_SERVER, serv_uplink->name); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPLINK_CAPAB, buf); + notice_lang(Config.s_OperServ, u, OPER_STATS_UPLINK_SERVER_COUNT, stats_count_servers(serv_uplink)); return MOD_CONT; } @@ -236,33 +236,33 @@ class CommandOSStats : public Command { long count, mem; - notice_lang(s_OperServ, u, OPER_STATS_BYTES_READ, total_read / 1024); - notice_lang(s_OperServ, u, OPER_STATS_BYTES_WRITTEN, total_written / 1024); + notice_lang(Config.s_OperServ, u, OPER_STATS_BYTES_READ, total_read / 1024); + notice_lang(Config.s_OperServ, u, OPER_STATS_BYTES_WRITTEN, total_written / 1024); get_user_stats(&count, &mem); - notice_lang(s_OperServ, u, OPER_STATS_USER_MEM, count, (mem + 512) / 1024); + notice_lang(Config.s_OperServ, u, OPER_STATS_USER_MEM, count, (mem + 512) / 1024); get_channel_stats(&count, &mem); - notice_lang(s_OperServ, u, OPER_STATS_CHANNEL_MEM, count, (mem + 512) / 1024); + notice_lang(Config.s_OperServ, u, OPER_STATS_CHANNEL_MEM, count, (mem + 512) / 1024); get_core_stats(&count, &mem); - notice_lang(s_OperServ, u, OPER_STATS_GROUPS_MEM, count, (mem + 512) / 1024); + notice_lang(Config.s_OperServ, u, OPER_STATS_GROUPS_MEM, count, (mem + 512) / 1024); get_aliases_stats(&count, &mem); - notice_lang(s_OperServ, u, OPER_STATS_ALIASES_MEM, count, (mem + 512) / 1024); + notice_lang(Config.s_OperServ, u, OPER_STATS_ALIASES_MEM, count, (mem + 512) / 1024); get_chanserv_stats(&count, &mem); - notice_lang(s_OperServ, u, OPER_STATS_CHANSERV_MEM, count, (mem + 512) / 1024); - if (s_BotServ) + notice_lang(Config.s_OperServ, u, OPER_STATS_CHANSERV_MEM, count, (mem + 512) / 1024); + if (Config.s_BotServ) { get_botserv_stats(&count, &mem); - notice_lang(s_OperServ, u, OPER_STATS_BOTSERV_MEM, count, (mem + 512) / 1024); + notice_lang(Config.s_OperServ, u, OPER_STATS_BOTSERV_MEM, count, (mem + 512) / 1024); } - if (s_HostServ) + if (Config.s_HostServ) { get_hostserv_stats(&count, &mem); - notice_lang(s_OperServ, u, OPER_STATS_HOSTSERV_MEM, count, (mem + 512) / 1024); + notice_lang(Config.s_OperServ, u, OPER_STATS_HOSTSERV_MEM, count, (mem + 512) / 1024); } get_operserv_stats(&count, &mem); - notice_lang(s_OperServ, u, OPER_STATS_OPERSERV_MEM, count, (mem + 512) / 1024); + notice_lang(Config.s_OperServ, u, OPER_STATS_OPERSERV_MEM, count, (mem + 512) / 1024); get_session_stats(&count, &mem); - notice_lang(s_OperServ, u, OPER_STATS_SESSIONS_MEM, count, (mem + 512) / 1024); + notice_lang(Config.s_OperServ, u, OPER_STATS_SESSIONS_MEM, count, (mem + 512) / 1024); return MOD_CONT; } @@ -282,7 +282,7 @@ class CommandOSStats : public Command else if (extra == "RESET") return this->DoStatsReset(u); else if (extra != "MEMORY" && extra != "UPLINK") - notice_lang(s_OperServ, u, OPER_STATS_UNKNOWN_OPTION, extra.c_str()); + notice_lang(Config.s_OperServ, u, OPER_STATS_UNKNOWN_OPTION, extra.c_str()); } if (extra.empty() || (extra != "MEMORY" && extra != "UPLINK")) @@ -299,7 +299,7 @@ class CommandOSStats : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_STATS); + notice_help(Config.s_OperServ, u, OPER_HELP_STATS); return true; } }; @@ -319,7 +319,7 @@ class OSStats : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_STATS); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_STATS); } }; diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c index 090980425..b86caf601 100644 --- a/src/core/os_svsnick.c +++ b/src/core/os_svsnick.c @@ -32,36 +32,36 @@ class CommandOSSVSNick : public Command /* Truncate long nicknames to NICKMAX-2 characters */ if (newnick.length() > NICKMAX - 2) { - notice_lang(s_OperServ, u, NICK_X_TRUNCATED, newnick.c_str(), NICKMAX - 2, newnick.c_str()); + notice_lang(Config.s_OperServ, u, NICK_X_TRUNCATED, newnick.c_str(), NICKMAX - 2, newnick.c_str()); newnick = params[1].substr(0, NICKMAX - 2); } /* Check for valid characters */ if (newnick[0] == '-' || isdigit(newnick[0])) { - notice_lang(s_OperServ, u, NICK_X_ILLEGAL, newnick.c_str()); + notice_lang(Config.s_OperServ, u, NICK_X_ILLEGAL, newnick.c_str()); return MOD_CONT; } for (unsigned i = 0; i < newnick.size(); ++i) { if (!isvalidnick(newnick[i])) { - notice_lang(s_OperServ, u, NICK_X_ILLEGAL, newnick.c_str()); + notice_lang(Config.s_OperServ, u, NICK_X_ILLEGAL, newnick.c_str()); return MOD_CONT; } } /* Check for a nick in use or a forbidden/suspended nick */ if (!finduser(nick)) - notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick); + notice_lang(Config.s_OperServ, u, NICK_X_NOT_IN_USE, nick); else if (finduser(newnick.c_str())) - notice_lang(s_OperServ, u, NICK_X_IN_USE, newnick.c_str()); + notice_lang(Config.s_OperServ, u, NICK_X_IN_USE, newnick.c_str()); else if ((na = findnick(newnick.c_str())) && (na->HasFlag(NS_FORBIDDEN))) - notice_lang(s_OperServ, u, NICK_X_FORBIDDEN, newnick.c_str()); + notice_lang(Config.s_OperServ, u, NICK_X_FORBIDDEN, newnick.c_str()); else { - notice_lang(s_OperServ, u, OPER_SVSNICK_NEWNICK, nick, newnick.c_str()); - ircdproto->SendGlobops(s_OperServ, "%s used SVSNICK to change %s to %s", u->nick, nick, newnick.c_str()); + notice_lang(Config.s_OperServ, u, OPER_SVSNICK_NEWNICK, nick, newnick.c_str()); + ircdproto->SendGlobops(Config.s_OperServ, "%s used SVSNICK to change %s to %s", u->nick, nick, newnick.c_str()); ircdproto->SendForceNickChange(nick, newnick.c_str(), time(NULL)); } return MOD_CONT; @@ -69,13 +69,13 @@ class CommandOSSVSNick : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_SVSNICK); + notice_help(Config.s_OperServ, u, OPER_HELP_SVSNICK); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "SVSNICK", OPER_SVSNICK_SYNTAX); + syntax_error(Config.s_OperServ, u, "SVSNICK", OPER_SVSNICK_SYNTAX); } }; @@ -97,7 +97,7 @@ class OSSVSNick : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_SVSNICK); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_SVSNICK); } }; diff --git a/src/core/os_szline.c b/src/core/os_szline.c index d0d9719dc..9beea2bc7 100644 --- a/src/core/os_szline.c +++ b/src/core/os_szline.c @@ -41,7 +41,7 @@ class CommandOSSZLine : public Command else expiry = NULL; - expires = expiry ? dotime(expiry) : SZLineExpiry; + expires = expiry ? dotime(expiry) : Config.SZLineExpiry; /* If the expiry given does not contain a final letter, it's in days, * said the doc. Ah well. */ @@ -50,7 +50,7 @@ class CommandOSSZLine : public Command /* Do not allow less than a minute expiry time */ if (expires != 0 && expires < 60) { - notice_lang(s_OperServ, u, BAD_EXPIRY_TIME); + notice_lang(Config.s_OperServ, u, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -68,13 +68,13 @@ class CommandOSSZLine : public Command if (strchr(mask, '!') || strchr(mask, '@')) { - notice_lang(s_OperServ, u, OPER_SZLINE_ONLY_IPS); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_ONLY_IPS); return MOD_CONT; } if (strspn(mask, "*?") == strlen(mask)) { - notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask); + notice_lang(Config.s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask); return MOD_CONT; } @@ -82,10 +82,10 @@ class CommandOSSZLine : public Command if (deleted < 0) return MOD_CONT; else if (deleted) - notice_lang(s_OperServ, u, OPER_SZLINE_DELETED_SEVERAL, deleted); - notice_lang(s_OperServ, u, OPER_SZLINE_ADDED, mask); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_DELETED_SEVERAL, deleted); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_ADDED, mask); - if (WallOSSZLine) + if (Config.WallOSSZLine) { char buf[128]; @@ -115,11 +115,11 @@ class CommandOSSZLine : public Command snprintf(buf, sizeof(buf), "expires in %d %s%s", wall_expiry, s, wall_expiry == 1 ? "" : "s"); } - ircdproto->SendGlobops(s_OperServ, "%s added an SZLINE for %s (%s)", u->nick, mask, buf); + ircdproto->SendGlobops(Config.s_OperServ, "%s added an SZLINE for %s (%s)", u->nick, mask, buf); } if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); } else @@ -143,7 +143,7 @@ class CommandOSSZLine : public Command if (!szlines.count) { - notice_lang(s_OperServ, u, OPER_SZLINE_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_LIST_EMPTY); return MOD_CONT; } @@ -153,28 +153,28 @@ class CommandOSSZLine : public Command res = slist_delete_range(&szlines, mask, NULL); if (!res) { - notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_NO_MATCH); return MOD_CONT; } else if (res == 1) - notice_lang(s_OperServ, u, OPER_SZLINE_DELETED_ONE); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_DELETED_ONE); else - notice_lang(s_OperServ, u, OPER_SZLINE_DELETED_SEVERAL, res); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_DELETED_SEVERAL, res); } else { if ((res = slist_indexof(&szlines, const_cast<char *>(mask))) == -1) { - notice_lang(s_OperServ, u, OPER_SZLINE_NOT_FOUND, mask); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_NOT_FOUND, mask); return MOD_CONT; } slist_delete(&szlines, res); - notice_lang(s_OperServ, u, OPER_SZLINE_DELETED, mask); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_DELETED, mask); } if (readonly) - notice_lang(s_OperServ, u, READ_ONLY_MODE); + notice_lang(Config.s_OperServ, u, READ_ONLY_MODE); return MOD_CONT; } @@ -186,7 +186,7 @@ class CommandOSSZLine : public Command if (!szlines.count) { - notice_lang(s_OperServ, u, OPER_SZLINE_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_LIST_EMPTY); return MOD_CONT; } @@ -197,7 +197,7 @@ class CommandOSSZLine : public Command res = slist_enum(&szlines, mask, &szline_list_callback, u, &sent_header); if (!res) { - notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_NO_MATCH); return MOD_CONT; } } @@ -214,7 +214,7 @@ class CommandOSSZLine : public Command } if (!sent_header) - notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_NO_MATCH); } return MOD_CONT; @@ -227,7 +227,7 @@ class CommandOSSZLine : public Command if (!szlines.count) { - notice_lang(s_OperServ, u, OPER_SZLINE_LIST_EMPTY); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_LIST_EMPTY); return MOD_CONT; } @@ -238,7 +238,7 @@ class CommandOSSZLine : public Command res = slist_enum(&szlines, mask, &szline_view_callback, u, &sent_header); if (!res) { - notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_NO_MATCH); return MOD_CONT; } } @@ -255,7 +255,7 @@ class CommandOSSZLine : public Command } if (!sent_header) - notice_lang(s_OperServ, u, OPER_SZLINE_NO_MATCH); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_NO_MATCH); } return MOD_CONT; @@ -264,7 +264,7 @@ class CommandOSSZLine : public Command CommandReturn DoClear(User *u) { slist_clear(&szlines, 1); - notice_lang(s_OperServ, u, OPER_SZLINE_CLEAR); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_CLEAR); return MOD_CONT; } @@ -294,13 +294,13 @@ class CommandOSSZLine : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_SZLINE); + notice_help(Config.s_OperServ, u, OPER_HELP_SZLINE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "SZLINE", OPER_SZLINE_SYNTAX); + syntax_error(Config.s_OperServ, u, "SZLINE", OPER_SZLINE_SYNTAX); } }; @@ -322,7 +322,7 @@ class OSSZLine : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_SZLINE); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_SZLINE); } }; @@ -336,14 +336,14 @@ int szline_view(int number, SXLine *sx, User *u, int *sent_header) if (!*sent_header) { - notice_lang(s_OperServ, u, OPER_SZLINE_VIEW_HEADER); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_VIEW_HEADER); *sent_header = 1; } tm = *localtime(&sx->seton); strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); expire_left(u->nc, expirebuf, sizeof(expirebuf), sx->expires); - notice_lang(s_OperServ, u, OPER_SZLINE_VIEW_FORMAT, number, sx->mask, sx->by, timebuf, expirebuf, sx->reason); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_VIEW_FORMAT, number, sx->mask, sx->by, timebuf, expirebuf, sx->reason); return 1; } @@ -374,11 +374,11 @@ int szline_list(int number, SXLine *sx, User *u, int *sent_header) if (!*sent_header) { - notice_lang(s_OperServ, u, OPER_SZLINE_LIST_HEADER); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_LIST_HEADER); *sent_header = 1; } - notice_lang(s_OperServ, u, OPER_SZLINE_LIST_FORMAT, number, sx->mask, sx->reason); + notice_lang(Config.s_OperServ, u, OPER_SZLINE_LIST_FORMAT, number, sx->mask, sx->reason); return 1; } diff --git a/src/core/os_umode.c b/src/core/os_umode.c index 35f5db994..34e3502e2 100644 --- a/src/core/os_umode.c +++ b/src/core/os_umode.c @@ -39,31 +39,31 @@ class CommandOSUMode : public Command return MOD_CONT; } if (!(u2 = finduser(nick))) - notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick); + notice_lang(Config.s_OperServ, u, NICK_X_NOT_IN_USE, nick); else { - ircdproto->SendMode(findbot(s_OperServ), nick, "%s", modes); + ircdproto->SendMode(findbot(Config.s_OperServ), nick, "%s", modes); common_svsmode(u2, modes, NULL); - notice_lang(s_OperServ, u, OPER_UMODE_SUCCESS, nick); - notice_lang(s_OperServ, u2, OPER_UMODE_CHANGED, u->nick); + notice_lang(Config.s_OperServ, u, OPER_UMODE_SUCCESS, nick); + notice_lang(Config.s_OperServ, u2, OPER_UMODE_CHANGED, u->nick); - if (WallOSMode) - ircdproto->SendGlobops(s_OperServ, "\2%s\2 used UMODE on %s", u->nick, nick); + if (Config.WallOSMode) + ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 used UMODE on %s", u->nick, nick); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_UMODE); + notice_help(Config.s_OperServ, u, OPER_HELP_UMODE); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_OperServ, u, "UMODE", OPER_UMODE_SYNTAX); + syntax_error(Config.s_OperServ, u, "UMODE", OPER_UMODE_SYNTAX); } }; @@ -85,7 +85,7 @@ class OSUMode : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_UMODE); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_UMODE); } }; diff --git a/src/core/os_update.c b/src/core/os_update.c index 888feb73f..cad669e30 100644 --- a/src/core/os_update.c +++ b/src/core/os_update.c @@ -24,14 +24,14 @@ class CommandOSUpdate : public Command CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { - notice_lang(s_OperServ, u, OPER_UPDATING); + notice_lang(Config.s_OperServ, u, OPER_UPDATING); save_data = 1; return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_UPDATE); + notice_help(Config.s_OperServ, u, OPER_HELP_UPDATE); return true; } }; @@ -51,7 +51,7 @@ class OSUpdate : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_UPDATE); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_UPDATE); } }; diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c index e96e460cb..681d8ece3 100644 --- a/src/core/os_userlist.c +++ b/src/core/os_userlist.c @@ -38,7 +38,7 @@ class CommandOSUserList : public Command { struct c_userlist *cu; - notice_lang(s_OperServ, u, OPER_USERLIST_HEADER_CHAN, pattern); + notice_lang(Config.s_OperServ, u, OPER_USERLIST_HEADER_CHAN, pattern); for (cu = c->users; cu; cu = cu->next) { @@ -50,7 +50,7 @@ class CommandOSUserList : public Command continue; } } - notice_lang(s_OperServ, u, OPER_USERLIST_RECORD, cu->user->nick, cu->user->GetIdent().c_str(), cu->user->GetDisplayedHost().c_str()); + notice_lang(Config.s_OperServ, u, OPER_USERLIST_RECORD, cu->user->nick, cu->user->GetIdent().c_str(), cu->user->GetDisplayedHost().c_str()); } } else @@ -59,7 +59,7 @@ class CommandOSUserList : public Command int i; User *u2; - notice_lang(s_OperServ, u, OPER_USERLIST_HEADER); + notice_lang(Config.s_OperServ, u, OPER_USERLIST_HEADER); for (i = 0; i < 1024; ++i) { @@ -79,18 +79,18 @@ class CommandOSUserList : public Command } } } - notice_lang(s_OperServ, u, OPER_USERLIST_RECORD, u2->nick, u2->GetIdent().c_str(), u2->GetDisplayedHost().c_str()); + notice_lang(Config.s_OperServ, u, OPER_USERLIST_RECORD, u2->nick, u2->GetIdent().c_str(), u2->GetDisplayedHost().c_str()); } } } - notice_lang(s_OperServ, u, OPER_USERLIST_END); + notice_lang(Config.s_OperServ, u, OPER_USERLIST_END); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_OperServ, u, OPER_HELP_USERLIST); + notice_help(Config.s_OperServ, u, OPER_HELP_USERLIST); return true; } }; @@ -110,7 +110,7 @@ class OSUserList : public Module } void OnOperServHelp(User *u) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_USERLIST); + notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_USERLIST); } }; diff --git a/src/core/ss_main.c b/src/core/ss_main.c index 90161f3a4..a24525d46 100644 --- a/src/core/ss_main.c +++ b/src/core/ss_main.c @@ -48,7 +48,7 @@ class SSMain : public Module if (!statserv) { alog("Creating SS"); - statserv = new BotInfo("StatServ", ServiceUser, ServiceHost, "Stats Service"); + statserv = new BotInfo("StatServ", Config.ServiceUser, Config.ServiceHost, "Stats Service"); } alog("Done creating SS"); statserv->cmdTable = cmdTable; diff --git a/src/datafiles.c b/src/datafiles.c index ee8fe8ec9..a051704be 100644 --- a/src/datafiles.c +++ b/src/datafiles.c @@ -84,7 +84,7 @@ static dbFILE *open_db_read(const char *service, const char *filename) f = new dbFILE; if (!f) { log_perror("Can't read %s database %s", service, filename); - if (time(NULL) - lastwarn > WarningTimeout) { + if (time(NULL) - lastwarn > Config.WarningTimeout) { ircdproto->SendGlobops(NULL, "Write error on %s: Memory allocation failed", filename); @@ -100,7 +100,7 @@ static dbFILE *open_db_read(const char *service, const char *filename) if (errno != ENOENT) log_perror("Can not read %s database %s", service, f->filename); - if (time(NULL) - lastwarn > WarningTimeout) { + if (time(NULL) - lastwarn > Config.WarningTimeout) { ircdproto->SendGlobops(NULL, "Write error on %s: %s", f->filename, strerror(errno)); lastwarn = time(NULL); @@ -201,7 +201,7 @@ static dbFILE *open_db_write(const char *service, const char *filename, #endif errno = errno_save; log_perror("Can not back up %s database %s", service, filename); - if (!NoBackupOkay) { + if (!Config.NoBackupOkay) { if (f->backupfp) fclose(f->backupfp); delete f; @@ -560,7 +560,7 @@ static void rename_database(const char *name, char *ext) snprintf(destpath, sizeof(destpath), "backups/%s.%s", name, ext); if (rename(name, destpath) != 0) { alog("Backup of %s failed.", name); - ircdproto->SendGlobops(s_OperServ, "WARNING! Backup of %s failed.", + ircdproto->SendGlobops(Config.s_OperServ, "WARNING! Backup of %s failed.", name); } } @@ -582,59 +582,59 @@ static void remove_backups() struct tm tm; time(&t); - t -= (60 * 60 * 24 * KeepBackups); + t -= (60 * 60 * 24 * Config.KeepBackups); tm = *localtime(&t); strftime(ext, sizeof(ext), "%Y%m%d", &tm); - snprintf(path, sizeof(path), "backups/%s.%s", NickDBName, ext); + snprintf(path, sizeof(path), "backups/%s.%s", Config.NickDBName, ext); #ifndef _WIN32 unlink(path); #else DeleteFile(path); #endif - snprintf(path, sizeof(path), "backups/%s.%s", ChanDBName, ext); + snprintf(path, sizeof(path), "backups/%s.%s", Config.ChanDBName, ext); #ifndef _WIN32 unlink(path); #else DeleteFile(path); #endif - snprintf(path, sizeof(path), "backups/%s.%s", OperDBName, ext); + snprintf(path, sizeof(path), "backups/%s.%s", Config.OperDBName, ext); #ifndef _WIN32 unlink(path); #else DeleteFile(path); #endif - snprintf(path, sizeof(path), "backups/%s.%s", NewsDBName, ext); + snprintf(path, sizeof(path), "backups/%s.%s", Config.NewsDBName, ext); #ifndef _WIN32 unlink(path); #else DeleteFile(path); #endif - snprintf(path, sizeof(path), "backups/%s.%s", ExceptionDBName, ext); + snprintf(path, sizeof(path), "backups/%s.%s", Config.ExceptionDBName, ext); #ifndef _WIN32 unlink(path); #else DeleteFile(path); #endif - if (s_BotServ) { - snprintf(path, sizeof(path), "backups/%s.%s", BotDBName, ext); + if (Config.s_BotServ) { + snprintf(path, sizeof(path), "backups/%s.%s", Config.BotDBName, ext); #ifndef _WIN32 unlink(path); #else DeleteFile(path); #endif } - if (s_HostServ) { - snprintf(path, sizeof(path), "backups/%s.%s", HostDBName, ext); + if (Config.s_HostServ) { + snprintf(path, sizeof(path), "backups/%s.%s", Config.HostDBName, ext); #ifndef _WIN32 unlink(path); #else DeleteFile(path); #endif } - if (NSEmailReg) { - snprintf(path, sizeof(path), "backups/%s.%s", PreNickDBName, ext); + if (Config.NSEmailReg) { + snprintf(path, sizeof(path), "backups/%s.%s", Config.PreNickDBName, ext); #ifndef _WIN32 unlink(path); #else @@ -656,7 +656,7 @@ void backup_databases() time_t t; struct tm tm; - if (!KeepBackups) { + if (!Config.KeepBackups) { return; } @@ -681,21 +681,21 @@ void backup_databases() curday = tm.tm_yday; strftime(ext, sizeof(ext), "%Y%m%d", &tm); - rename_database(NickDBName, ext); - if (s_BotServ) { - rename_database(BotDBName, ext); + rename_database(Config.NickDBName, ext); + if (Config.s_BotServ) { + rename_database(Config.BotDBName, ext); } - rename_database(ChanDBName, ext); - if (s_HostServ) { - rename_database(HostDBName, ext); + rename_database(Config.ChanDBName, ext); + if (Config.s_HostServ) { + rename_database(Config.HostDBName, ext); } - if (NSEmailReg) { - rename_database(PreNickDBName, ext); + if (Config.NSEmailReg) { + rename_database(Config.PreNickDBName, ext); } - rename_database(OperDBName, ext); - rename_database(NewsDBName, ext); - rename_database(ExceptionDBName, ext); + rename_database(Config.OperDBName, ext); + rename_database(Config.NewsDBName, ext); + rename_database(Config.ExceptionDBName, ext); } } @@ -707,7 +707,7 @@ void ModuleDatabaseBackup(const char *dbname) time_t t; struct tm tm; - if (!KeepBackups) { + if (!Config.KeepBackups) { return; } @@ -744,7 +744,7 @@ void ModuleRemoveBackups(const char *dbname) struct tm tm; time(&t); - t -= (60 * 60 * 24 * KeepBackups); + t -= (60 * 60 * 24 * Config.KeepBackups); tm = *localtime(&t); strftime(ext, sizeof(ext), "%Y%m%d", &tm); diff --git a/src/hostserv.c b/src/hostserv.c index 1ba5cf106..c28db13d5 100644 --- a/src/hostserv.c +++ b/src/hostserv.c @@ -31,7 +31,7 @@ E void moduleAddHostServCmds(); void moduleAddHostServCmds() { - ModuleManager::LoadModuleList(HostServCoreModules); + ModuleManager::LoadModuleList(Config.HostServCoreModules); } /*************************************************************************/ @@ -71,7 +71,7 @@ void get_hostserv_stats(long *nrec, long *memuse) */ void hostserv_init() { - if (s_HostServ) { + if (Config.s_HostServ) { moduleAddHostServCmds(); } } @@ -96,12 +96,12 @@ void hostserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - ircdproto->SendCTCP(findbot(s_HostServ), u->nick, "PING %s", s); + ircdproto->SendCTCP(findbot(Config.s_HostServ), u->nick, "PING %s", s); } else { if (ircd->vhost) { - mod_run_cmd(s_HostServ, u, HOSTSERV, cmd); + mod_run_cmd(Config.s_HostServ, u, HOSTSERV, cmd); } else { - notice_lang(s_HostServ, u, SERVICE_OFFLINE, s_HostServ); + notice_lang(Config.s_HostServ, u, SERVICE_OFFLINE, Config.s_HostServ); } } } @@ -131,7 +131,7 @@ HostCore *createHostCorelist(HostCore * next, const char *nick, char *vIdent, next = new HostCore; if (next == NULL) { - ircdproto->SendGlobops(s_HostServ, + ircdproto->SendGlobops(Config.s_HostServ, "Unable to allocate memory to create the vHost LL, problems i sense.."); } else { next->nick = new char[strlen(nick) + 1]; @@ -141,7 +141,7 @@ HostCore *createHostCorelist(HostCore * next, const char *nick, char *vIdent, next->vIdent = new char[strlen(vIdent) + 1]; if ((next->nick == NULL) || (next->vHost == NULL) || (next->creator == NULL)) { - ircdproto->SendGlobops(s_HostServ, + ircdproto->SendGlobops(Config.s_HostServ, "Unable to allocate memory to create the vHost LL, problems i sense.."); return NULL; } @@ -150,7 +150,7 @@ HostCore *createHostCorelist(HostCore * next, const char *nick, char *vIdent, strlcpy(next->creator, creator, strlen(creator) + 1); if (vIdent) { if ((next->vIdent == NULL)) { - ircdproto->SendGlobops(s_HostServ, + ircdproto->SendGlobops(Config.s_HostServ, "Unable to allocate memory to create the vHost LL, problems i sense.."); return NULL; } @@ -219,7 +219,7 @@ HostCore *insertHostCore(HostCore * phead, HostCore * prev, const char *nick, newCore = new HostCore; if (newCore == NULL) { - ircdproto->SendGlobops(s_HostServ, + ircdproto->SendGlobops(Config.s_HostServ, "Unable to allocate memory to insert into the vHost LL, problems i sense.."); return NULL; } else { @@ -230,7 +230,7 @@ HostCore *insertHostCore(HostCore * phead, HostCore * prev, const char *nick, newCore->vIdent = new char[strlen(vIdent) + 1]; if ((newCore->nick == NULL) || (newCore->vHost == NULL) || (newCore->creator == NULL)) { - ircdproto->SendGlobops(s_HostServ, + ircdproto->SendGlobops(Config.s_HostServ, "Unable to allocate memory to create the vHost LL, problems i sense.."); return NULL; } @@ -239,7 +239,7 @@ HostCore *insertHostCore(HostCore * phead, HostCore * prev, const char *nick, strlcpy(newCore->creator, creator, strlen(creator) + 1); if (vIdent) { if ((newCore->vIdent == NULL)) { - ircdproto->SendGlobops(s_HostServ, + ircdproto->SendGlobops(Config.s_HostServ, "Unable to allocate memory to create the vHost LL, problems i sense.."); return NULL; } @@ -361,7 +361,7 @@ void delHostCore(const char *nick) #define SAFE(x) do { \ if ((x) < 0) { \ if (!forceload) \ - fatal("Read error on %s", HostDBName); \ + fatal("Read error on %s", Config.HostDBName); \ failed = 1; \ break; \ } \ @@ -372,14 +372,14 @@ void load_hs_dbase() dbFILE *f; int ver; - if (!(f = open_db(s_HostServ, HostDBName, "r", HOST_VERSION))) { + if (!(f = open_db(Config.s_HostServ, Config.HostDBName, "r", HOST_VERSION))) { return; } ver = get_file_version(f); if (ver != 3) { close_db(f); - fatal("DB %s is too old", HostDBName); + fatal("DB %s is too old", Config.HostDBName); return; } @@ -422,7 +422,7 @@ void load_hs_dbase(dbFILE * f) } else { - fatal("Invalid format in %s %d", HostDBName, c); + fatal("Invalid format in %s %d", Config.HostDBName, c); } } } @@ -432,9 +432,9 @@ void load_hs_dbase(dbFILE * f) #define SAFE(x) do { \ if ((x) < 0) { \ restore_db(f); \ - log_perror("Write error on %s", HostDBName); \ - if (time(NULL) - lastwarn > WarningTimeout) { \ - ircdproto->SendGlobops(NULL, "Write error on %s: %s", HostDBName, \ + log_perror("Write error on %s", Config.HostDBName); \ + if (time(NULL) - lastwarn > Config.WarningTimeout) { \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", Config.HostDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -448,7 +448,7 @@ void save_hs_dbase() static time_t lastwarn = 0; HostCore *current; - if (!(f = open_db(s_HostServ, HostDBName, "w", HOST_VERSION))) + if (!(f = open_db(Config.s_HostServ, Config.HostDBName, "w", HOST_VERSION))) return; current = head; @@ -497,10 +497,10 @@ int do_on_id(User * u) vIdent = getvIdent(u->nick); if (vHost != NULL) { if (vIdent) { - notice_lang(s_HostServ, u, HOST_IDENT_ACTIVATED, vIdent, + notice_lang(Config.s_HostServ, u, HOST_IDENT_ACTIVATED, vIdent, vHost); } else { - notice_lang(s_HostServ, u, HOST_ACTIVATED, vHost); + notice_lang(Config.s_HostServ, u, HOST_ACTIVATED, vHost); } ircdproto->SendVhost(u->nick, vIdent, vHost); if (ircd->vhost) diff --git a/src/init.c b/src/init.c index ec82532df..07a5e54da 100644 --- a/src/init.c +++ b/src/init.c @@ -171,38 +171,38 @@ static int parse_options(int ac, char **av) *t++ = 0; portnum = atoi(t); if ((portnum >= 0) && (portnum < 65535)) - LocalPort = portnum; + Config.LocalPort = portnum; else { fprintf(stderr, "-local: Port numbers must be in the range 1..65535 or 0. Using default.\n"); return -1; } } - LocalHost = s; + Config.LocalHost = s; } else if (strcmp(s, "name") == 0) { if (++i >= ac) { fprintf(stderr, "-name requires a parameter\n"); return -1; } - ServerName = av[i]; + Config.ServerName = av[i]; } else if (strcmp(s, "desc") == 0) { if (++i >= ac) { fprintf(stderr, "-desc requires a parameter\n"); return -1; } - ServerDesc = av[i]; + Config.ServerDesc = av[i]; } else if (strcmp(s, "user") == 0) { if (++i >= ac) { fprintf(stderr, "-user requires a parameter\n"); return -1; } - ServiceUser = av[i]; + Config.ServiceUser = av[i]; } else if (strcmp(s, "host") == 0) { if (++i >= ac) { fprintf(stderr, "-host requires a parameter\n"); return -1; } - ServiceHost = av[i]; + Config.ServiceHost = av[i]; } else if (strcmp(s, "dir") == 0) { /* Handled by parse_dir_options() */ i++; /* Skip parameter */ @@ -220,7 +220,7 @@ static int parse_options(int ac, char **av) "-update: number of seconds must be positive"); return -1; } else - UpdateTimeout = atol(s); + Config.UpdateTimeout = atol(s); } else if (strcmp(s, "expire") == 0) { if (++i >= ac) { fprintf(stderr, "-expire requires a parameter\n"); @@ -232,7 +232,7 @@ static int parse_options(int ac, char **av) "-expire: number of seconds must be positive\n"); return -1; } else - ExpireTimeout = atol(s); + Config.ExpireTimeout = atol(s); } else if (strcmp(s, "debug") == 0) { /* Handled by parse_dir_options() */ } else if (strcmp(s, "readonly") == 0) { @@ -240,10 +240,10 @@ static int parse_options(int ac, char **av) } else if (strcmp(s, "nofork") == 0) { /* Handled by parse_dir_options() */ } else if (strcmp(s, "logchan") == 0) { - if (!LogChannel) { + if (!Config.LogChannel) { fprintf(stderr, - "-logchan: LogChannel must be defined in services.conf\n"); - } else { /* LogChannel */ + "-logchan: Config.LogChannel must be defined in services.conf\n"); + } else { /* Config.LogChannel */ LogChan = true; } @@ -310,7 +310,7 @@ static int parse_options(int ac, char **av) static void remove_pidfile() { - remove(PIDFilename); + remove(Config.PIDFilename); } /*************************************************************************/ @@ -321,7 +321,7 @@ static void write_pidfile() { FILE *pidfile; - pidfile = fopen(PIDFilename, "w"); + pidfile = fopen(Config.PIDFilename, "w"); if (pidfile) { #ifdef _WIN32 fprintf(pidfile, "%d\n", static_cast<int>(GetCurrentProcessId())); @@ -331,7 +331,7 @@ static void write_pidfile() fclose(pidfile); atexit(remove_pidfile); } else { - log_perror("Warning: cannot write to PID file %s", PIDFilename); + log_perror("Warning: cannot write to PID file %s", Config.PIDFilename); } } @@ -378,7 +378,7 @@ int init_primary(int ac, char **av) } /* Disable the log channel if its defined in the conf, but not enabled */ - if (!LogChannel && LogChan) + if (!Config.LogChannel && LogChan) LogChan = false; /* Add IRCD Protocol Module; exit if there are errors */ @@ -387,7 +387,7 @@ int init_primary(int ac, char **av) } /* Add Encryption Modules */ - ModuleManager::LoadModuleList(EncModuleList); + ModuleManager::LoadModuleList(Config.EncModuleList); return 0; } @@ -493,7 +493,7 @@ int init_secondary(int ac, char **av) /* load any custom modules */ if (!nothird) - ModuleManager::LoadModuleList(ModulesAutoLoad); + ModuleManager::LoadModuleList(Config.ModulesAutoLoad); /* Initialize random number generator */ rand_init(); @@ -502,37 +502,37 @@ int init_secondary(int ac, char **av) /* Load up databases */ load_ns_dbase(); if (debug) - alog("debug: Loaded %s database (1/%d)", s_NickServ, - (PreNickDBName ? 7 : 6)); - if (s_HostServ) { + alog("debug: Loaded %s database (1/%d)", Config.s_NickServ, + (Config.PreNickDBName ? 7 : 6)); + if (Config.s_HostServ) { load_hs_dbase(); if (debug) - alog("debug: Loaded %s database (2/%d)", s_HostServ, - (PreNickDBName ? 7 : 6)); + alog("debug: Loaded %s database (2/%d)", Config.s_HostServ, + (Config.PreNickDBName ? 7 : 6)); } else if (debug) { - alog("debug: HostServ database (2/%d) not loaded because HostServ is disabled", (PreNickDBName ? 7 : 6)); + alog("debug: HostServ database (2/%d) not loaded because HostServ is disabled", (Config.PreNickDBName ? 7 : 6)); } - if (s_BotServ) { + if (Config.s_BotServ) { load_bs_dbase(); if (debug) - alog("debug: Loaded %s database (3/%d)", s_BotServ, - (PreNickDBName ? 7 : 6)); + alog("debug: Loaded %s database (3/%d)", Config.s_BotServ, + (Config.PreNickDBName ? 7 : 6)); } else if (debug) { - alog("debug: BotServ database (3/%d) not loaded because BotServ is disabled", (PreNickDBName ? 7 : 6)); + alog("debug: BotServ database (3/%d) not loaded because BotServ is disabled", (Config.PreNickDBName ? 7 : 6)); } load_cs_dbase(); if (debug) - alog("debug: Loaded %s database (4/%d)", s_ChanServ, - (PreNickDBName ? 7 : 6)); + alog("debug: Loaded %s database (4/%d)", Config.s_ChanServ, + (Config.PreNickDBName ? 7 : 6)); load_os_dbase(); if (debug) - alog("debug: Loaded %s database (5/%d)", s_OperServ, - (PreNickDBName ? 7 : 6)); + alog("debug: Loaded %s database (5/%d)", Config.s_OperServ, + (Config.PreNickDBName ? 7 : 6)); load_exceptions(); if (debug) alog("debug: Loaded exception database (6/%d)", - (PreNickDBName ? 7 : 6)); - if (PreNickDBName) { + (Config.PreNickDBName ? 7 : 6)); + if (Config.PreNickDBName) { load_ns_req_db(); if (debug) alog("debug: Loaded PreNick database (7/7)"); @@ -540,7 +540,7 @@ int init_secondary(int ac, char **av) alog("Databases loaded"); // XXX: this is duplicated in type loading. - for (std::list<std::pair<std::string, std::string> >::iterator it = svsopers_in_config.begin(); it != svsopers_in_config.end(); it++) + for (std::list<std::pair<std::string, std::string> >::iterator it = Config.Opers.begin(); it != Config.Opers.end(); it++) { std::string nick = it->first; std::string type = it->second; @@ -559,7 +559,7 @@ int init_secondary(int ac, char **av) abort(); } - for (std::list<OperType *>::iterator tit = MyOperTypes.begin(); tit != MyOperTypes.end(); tit++) + for (std::list<OperType *>::iterator tit = Config.MyOperTypes.begin(); tit != Config.MyOperTypes.end(); tit++) { OperType *ot = *tit; if (ot->GetName() == type) @@ -573,28 +573,28 @@ int init_secondary(int ac, char **av) /* this is only used on the first run of Anope. */ - /* s_NickServ will always be an existing bot (if there + /* Config.s_NickServ will always be an existing bot (if there * are databases) because Anope now tracks what nick * each core bot is on, and changes them if needed * when loading the databases */ - BotInfo *bi = findbot(s_NickServ); + BotInfo *bi = findbot(Config.s_NickServ); if (!bi) { - if (s_OperServ) - bi = new BotInfo(s_OperServ, ServiceUser, ServiceHost, desc_OperServ); - if (s_NickServ) - bi = new BotInfo(s_NickServ, ServiceUser, ServiceHost, desc_NickServ); - if (s_ChanServ) - bi = new BotInfo(s_ChanServ, ServiceUser, ServiceHost, desc_ChanServ); - if (s_HostServ) - bi = new BotInfo(s_HostServ, ServiceUser, ServiceHost, desc_HostServ); - if (s_MemoServ) - bi = new BotInfo(s_MemoServ, ServiceUser, ServiceHost, desc_MemoServ); - if (s_BotServ) - bi = new BotInfo(s_BotServ, ServiceUser, ServiceHost, desc_BotServ); - if (s_GlobalNoticer) - bi = new BotInfo(s_GlobalNoticer, ServiceUser, ServiceHost, desc_GlobalNoticer); + if (Config.s_OperServ) + bi = new BotInfo(Config.s_OperServ, Config.ServiceUser, Config.ServiceHost, Config.desc_OperServ); + if (Config.s_NickServ) + bi = new BotInfo(Config.s_NickServ, Config.ServiceUser, Config.ServiceHost, Config.desc_NickServ); + if (Config.s_ChanServ) + bi = new BotInfo(Config.s_ChanServ, Config.ServiceUser, Config.ServiceHost, Config.desc_ChanServ); + if (Config.s_HostServ) + bi = new BotInfo(Config.s_HostServ, Config.ServiceUser, Config.ServiceHost, Config.desc_HostServ); + if (Config.s_MemoServ) + bi = new BotInfo(Config.s_MemoServ, Config.ServiceUser, Config.ServiceHost, Config.desc_MemoServ); + if (Config.s_BotServ) + bi = new BotInfo(Config.s_BotServ, Config.ServiceUser, Config.ServiceHost, Config.desc_BotServ); + if (Config.s_GlobalNoticer) + bi = new BotInfo(Config.s_GlobalNoticer, Config.ServiceUser, Config.ServiceHost, Config.desc_GlobalNoticer); } FOREACH_MOD(I_OnPostLoadDatabases, OnPostLoadDatabases()); @@ -604,11 +604,11 @@ int init_secondary(int ac, char **av) FOREACH_MOD(I_OnPreServerConnect, OnPreServerConnect()); /* Connect to the remote server */ - std::list<Uplink *>::iterator curr_uplink = Uplinks.begin(), end_uplink = Uplinks.end(); + std::list<Uplink *>::iterator curr_uplink = Config.Uplinks.begin(), end_uplink = Config.Uplinks.end(); int servernum = 1; for (; curr_uplink != end_uplink; ++curr_uplink, ++servernum) { uplink_server = *curr_uplink; - servsock = conn(uplink_server->host, uplink_server->port, LocalHost, LocalPort); + servsock = conn(uplink_server->host, uplink_server->port, Config.LocalHost, Config.LocalPort); if (servsock >= 0) { alog("Connected to Server %d (%s:%d)", servernum, uplink_server->host, uplink_server->port); break; diff --git a/src/language.c b/src/language.c index d8adc96c5..6053c25c3 100644 --- a/src/language.c +++ b/src/language.c @@ -161,7 +161,7 @@ void lang_sanitize() if (strstr(langtexts[i][j], "%R")) { len = strlen(langtexts[i][j]); strscpy(tmp, langtexts[i][j], sizeof(tmp)); - if (UseStrictPrivMsg) { + if (Config.UseStrictPrivMsg) { strnrepl(tmp, sizeof(tmp), "%R", "/"); } else { strnrepl(tmp, sizeof(tmp), "%R", "/msg "); @@ -215,8 +215,8 @@ void lang_init() /* Not what I intended to do, but these services are so archaïc * that it's difficult to do more. */ - if ((NSDefLanguage = langlist[NSDefLanguage]) < 0) - NSDefLanguage = DEF_LANGUAGE; + if ((Config.NSDefLanguage = langlist[Config.NSDefLanguage]) < 0) + Config.NSDefLanguage = DEF_LANGUAGE; if (!langtexts[DEF_LANGUAGE]) fatal("Unable to load default language"); @@ -240,7 +240,7 @@ void lang_init() int strftime_lang(char *buf, int size, User * u, int format, struct tm *tm) { - int language = u && u->nc ? u->nc->language : NSDefLanguage; + int language = u && u->nc ? u->nc->language : Config.NSDefLanguage; char tmpbuf[BUFSIZE], buf2[BUFSIZE]; char *s; int i, ret; @@ -309,7 +309,7 @@ void syntax_error(char *service, User * u, const char *command, int msgnum) const char *getstring(NickAlias *na, int index) { // Default to config - int langidx = NSDefLanguage; + int langidx = Config.NSDefLanguage; // If they are registered (na->nc), and NOT forbidden if (na && na->nc && !na->HasFlag(NS_FORBIDDEN)) @@ -321,7 +321,7 @@ const char *getstring(NickAlias *na, int index) const char *getstring(NickCore *nc, int index) { // Default to config - int langidx = NSDefLanguage; + int langidx = Config.NSDefLanguage; if (nc) { @@ -339,7 +339,7 @@ const char *getstring(User *u, int index) const char *getstring(int index) { // Default to config - int langidx = NSDefLanguage; + int langidx = Config.NSDefLanguage; return langtexts[langidx][index]; } @@ -49,11 +49,11 @@ static void remove_log() char name[PATH_MAX]; - if (!KeepLogs) + if (!Config.KeepLogs) return; time(&t); - t -= (60 * 60 * 24 * KeepLogs); + t -= (60 * 60 * 24 * Config.KeepLogs); tm = *localtime(&t); /* removed if from here cause get_logchan is always 1 */ @@ -176,8 +176,8 @@ void alog(const char *fmt, ...) if (nofork) { fprintf(stderr, "%s %s\n", buf, str); } - if (LogChannel && LogChan && !debug && findchan(LogChannel)) { - ircdproto->SendPrivmsg(findbot(s_GlobalNoticer), LogChannel, "%s", str); + if (Config.LogChannel && LogChan && !debug && findchan(Config.LogChannel)) { + ircdproto->SendPrivmsg(findbot(Config.s_GlobalNoticer), Config.LogChannel, "%s", str); } errno = errno_save; } diff --git a/src/mail.c b/src/mail.c index e9d137bf9..4b24332f1 100644 --- a/src/mail.c +++ b/src/mail.c @@ -35,10 +35,10 @@ MailInfo *MailRegBegin(User * u, NickRequest * nr, char *subject, return NULL; } - if (!UseMail) { + if (!Config.UseMail) { notice_lang(service, u, MAIL_DISABLED); - } else if ((time(NULL) - u->lastmail < MailDelay)) { - timeToWait = MailDelay - (time(NULL) - u->lastmail); + } else if ((time(NULL) - u->lastmail < Config.MailDelay)) { + timeToWait = Config.MailDelay - (time(NULL) - u->lastmail); notice_lang(service, u, MAIL_DELAYED, timeToWait); } else if (!nr->email) { notice_lang(service, u, MAIL_INVALID, nr->nick); @@ -50,14 +50,14 @@ MailInfo *MailRegBegin(User * u, NickRequest * nr, char *subject, mail->recipient = NULL; mail->recip = nr; - if (!(mail->pipe = popen(SendMailPath, "w"))) { + if (!(mail->pipe = popen(Config.SendMailPath, "w"))) { delete mail; notice_lang(service, u, MAIL_LATER); return NULL; } - fprintf(mail->pipe, "From: %s\n", SendFrom); - if (DontQuoteAddresses) { + fprintf(mail->pipe, "From: %s\n", Config.SendFrom); + if (Config.DontQuoteAddresses) { fprintf(mail->pipe, "To: %s <%s>\n", nr->nick, nr->email); } else { fprintf(mail->pipe, "To: \"%s\" <%s>\n", nr->nick, nr->email); @@ -87,12 +87,12 @@ MailInfo *MailBegin(User * u, NickCore * nc, char *subject, char *service) return NULL; } - if (!UseMail) { + if (!Config.UseMail) { notice_lang(service, u, MAIL_DISABLED); - } else if (((time(NULL) - u->lastmail < MailDelay) - || (time(NULL) - nc->lastmail < MailDelay)) + } else if (((time(NULL) - u->lastmail < Config.MailDelay) + || (time(NULL) - nc->lastmail < Config.MailDelay)) && !(u->nc && u->nc->IsServicesOper())) { - notice_lang(service, u, MAIL_DELAYED, MailDelay); + notice_lang(service, u, MAIL_DELAYED, Config.MailDelay); } else if (!nc->email) { notice_lang(service, u, MAIL_INVALID, nc->display); } else { @@ -103,14 +103,14 @@ MailInfo *MailBegin(User * u, NickCore * nc, char *subject, char *service) mail->recipient = nc; mail->recip = NULL; - if (!(mail->pipe = popen(SendMailPath, "w"))) { + if (!(mail->pipe = popen(Config.SendMailPath, "w"))) { delete mail; notice_lang(service, u, MAIL_LATER); return NULL; } - fprintf(mail->pipe, "From: %s\n", SendFrom); - if (DontQuoteAddresses) { + fprintf(mail->pipe, "From: %s\n", Config.SendFrom); + if (Config.DontQuoteAddresses) { fprintf(mail->pipe, "To: %s <%s>\n", nc->display, nc->email); } else { fprintf(mail->pipe, "To: \"%s\" <%s>\n", nc->display, @@ -137,7 +137,7 @@ MailInfo *MailMemoBegin(NickCore * nc) if (!nc) return NULL; - if (!UseMail || !nc->email) { + if (!Config.UseMail || !nc->email) { return NULL; } else { @@ -148,13 +148,13 @@ MailInfo *MailMemoBegin(NickCore * nc) mail->recipient = nc; mail->recip = NULL; - if (!(mail->pipe = popen(SendMailPath, "w"))) { + if (!(mail->pipe = popen(Config.SendMailPath, "w"))) { delete mail; return NULL; } - fprintf(mail->pipe, "From: %s\n", SendFrom); - if (DontQuoteAddresses) { + fprintf(mail->pipe, "From: %s\n", Config.SendFrom); + if (Config.DontQuoteAddresses) { fprintf(mail->pipe, "To: %s <%s>\n", nc->display, nc->email); } else { fprintf(mail->pipe, "To: \"%s\" <%s>\n", nc->display, diff --git a/src/main.c b/src/main.c index 1d2d05f1a..570583880 100644 --- a/src/main.c +++ b/src/main.c @@ -141,14 +141,14 @@ void save_databases() alog("debug: Saving FFF databases"); backup_databases(); save_ns_dbase(); - if (PreNickDBName) { + if (Config.PreNickDBName) { save_ns_req_dbase(); } save_cs_dbase(); - if (s_BotServ) { + if (Config.s_BotServ) { save_bs_dbase(); } - if (s_HostServ) { + if (Config.s_HostServ) { save_hs_dbase(); } save_os_dbase(); @@ -170,7 +170,7 @@ void do_restart_services() if (!quitmsg) quitmsg = "Restarting"; - ircdproto->SendSquit(ServerName, quitmsg); + ircdproto->SendSquit(Config.ServerName, quitmsg); disconn(servsock); close_log(); /* First don't unload protocol module, then do so */ @@ -203,7 +203,7 @@ static void services_shutdown() quitmsg = "Terminating, reason unknown"; alog("%s", quitmsg); if (started) { - ircdproto->SendSquit(ServerName, quitmsg); + ircdproto->SendSquit(Config.ServerName, quitmsg); if (uplink) delete [] uplink; if (ircd->chanmodes) { @@ -432,7 +432,7 @@ int main(int ac, char **av, char **envp) started = 1; #ifndef _WIN32 - if (DumpCore) + if (Config.DumpCore) { rlimit rl; if (getrlimit(RLIMIT_CORE, &rl) == -1) @@ -459,13 +459,13 @@ int main(int ac, char **av, char **envp) alog("debug: Top of main loop"); // Never fear. noexpire/readonly are checked in expire_all(). - if (save_data || t - last_expire >= ExpireTimeout) + if (save_data || t - last_expire >= Config.ExpireTimeout) { expire_all(); last_expire = t; } - if (!readonly && (save_data || t - last_update >= UpdateTimeout)) { + if (!readonly && (save_data || t - last_update >= Config.UpdateTimeout)) { if (delayed_quit) ircdproto->SendGlobops(NULL, "Updating databases on shutdown, please wait."); @@ -482,7 +482,7 @@ int main(int ac, char **av, char **envp) if (delayed_quit) break; - if (t - last_check >= TimeoutCheck) { + if (t - last_check >= Config.TimeoutCheck) { TimerManager::TickTimers(t); last_check = t; } @@ -517,7 +517,7 @@ int main(int ac, char **av, char **envp) alog("Restarting"); if (!quitmsg) quitmsg = "Restarting"; - ircdproto->SendSquit(ServerName, quitmsg); + ircdproto->SendSquit(Config.ServerName, quitmsg); disconn(servsock); close_log(); chdir(orig_cwd.c_str()); diff --git a/src/memoserv.c b/src/memoserv.c index f1bbda347..2ea19763f 100644 --- a/src/memoserv.c +++ b/src/memoserv.c @@ -25,7 +25,7 @@ E void rsend_notify(User *u, Memo *m, const char *chan); /*************************************************************************/ void moduleAddMemoServCmds() { - ModuleManager::LoadModuleList(MemoServCoreModules); + ModuleManager::LoadModuleList(Config.MemoServCoreModules); } /*************************************************************************/ @@ -63,9 +63,9 @@ void memoserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - ircdproto->SendCTCP(findbot(s_MemoServ), u->nick, "PING %s", s); + ircdproto->SendCTCP(findbot(Config.s_MemoServ), u->nick, "PING %s", s); } else { - mod_run_cmd(s_MemoServ, u, MEMOSERV, cmd); + mod_run_cmd(Config.s_MemoServ, u, MEMOSERV, cmd); } } @@ -100,27 +100,27 @@ void check_memos(User * u) newcnt++; } if (newcnt > 0) { - notice_lang(s_MemoServ, u, + notice_lang(Config.s_MemoServ, u, newcnt == 1 ? MEMO_HAVE_NEW_MEMO : MEMO_HAVE_NEW_MEMOS, newcnt); if (newcnt == 1 && (nc->memos.memos[i - 1]->HasFlag(MF_UNREAD))) { - notice_lang(s_MemoServ, u, MEMO_TYPE_READ_LAST, s_MemoServ); + notice_lang(Config.s_MemoServ, u, MEMO_TYPE_READ_LAST, Config.s_MemoServ); } else if (newcnt == 1) { for (i = 0; i < nc->memos.memos.size(); i++) { if (nc->memos.memos[i]->HasFlag(MF_UNREAD)) break; } - notice_lang(s_MemoServ, u, MEMO_TYPE_READ_NUM, s_MemoServ, + notice_lang(Config.s_MemoServ, u, MEMO_TYPE_READ_NUM, Config.s_MemoServ, nc->memos.memos[i]->number); } else { - notice_lang(s_MemoServ, u, MEMO_TYPE_LIST_NEW, s_MemoServ); + notice_lang(Config.s_MemoServ, u, MEMO_TYPE_LIST_NEW, Config.s_MemoServ); } } if (nc->memos.memomax > 0 && nc->memos.memos.size() >= nc->memos.memomax) { if (nc->memos.memos.size() > nc->memos.memomax) - notice_lang(s_MemoServ, u, MEMO_OVER_LIMIT, nc->memos.memomax); + notice_lang(Config.s_MemoServ, u, MEMO_OVER_LIMIT, nc->memos.memomax); else - notice_lang(s_MemoServ, u, MEMO_AT_LIMIT, nc->memos.memomax); + notice_lang(Config.s_MemoServ, u, MEMO_AT_LIMIT, nc->memos.memomax); } } @@ -200,48 +200,48 @@ void memo_send(User * u, const char *name, const char *text, int z) int is_servoper = u->nc && u->nc->IsServicesOper(); if (readonly) { - notice_lang(s_MemoServ, u, MEMO_SEND_DISABLED); + notice_lang(Config.s_MemoServ, u, MEMO_SEND_DISABLED); } else if (!text) { if (z == 0) - syntax_error(s_MemoServ, u, "SEND", MEMO_SEND_SYNTAX); + syntax_error(Config.s_MemoServ, u, "SEND", MEMO_SEND_SYNTAX); if (z == 3) - syntax_error(s_MemoServ, u, "RSEND", MEMO_RSEND_SYNTAX); + syntax_error(Config.s_MemoServ, u, "RSEND", MEMO_RSEND_SYNTAX); } else if (!nick_identified(u) && !u->IsRecognized()) { if (z == 0 || z == 3) - notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ); + notice_lang(Config.s_MemoServ, u, NICK_IDENTIFY_REQUIRED, Config.s_NickServ); } else if (!(mi = getmemoinfo(name, &ischan, &isforbid))) { if (z == 0 || z == 3) { if (isforbid) { - notice_lang(s_MemoServ, u, + notice_lang(Config.s_MemoServ, u, ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, name); } else { - notice_lang(s_MemoServ, u, + notice_lang(Config.s_MemoServ, u, ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, name); } } - } else if (z != 2 && MSSendDelay > 0 && - u && u->lastmemosend + MSSendDelay > now) { + } else if (z != 2 && Config.MSSendDelay > 0 && + u && u->lastmemosend + Config.MSSendDelay > now) { u->lastmemosend = now; if (z == 0) - notice_lang(s_MemoServ, u, MEMO_SEND_PLEASE_WAIT, MSSendDelay); + notice_lang(Config.s_MemoServ, u, MEMO_SEND_PLEASE_WAIT, Config.MSSendDelay); if (z == 3) - notice_lang(s_MemoServ, u, MEMO_RSEND_PLEASE_WAIT, - MSSendDelay); + notice_lang(Config.s_MemoServ, u, MEMO_RSEND_PLEASE_WAIT, + Config.MSSendDelay); } else if (mi->memomax == 0 && !is_servoper) { if (z == 0 || z == 3) - notice_lang(s_MemoServ, u, MEMO_X_GETS_NO_MEMOS, name); + notice_lang(Config.s_MemoServ, u, MEMO_X_GETS_NO_MEMOS, name); } else if (mi->memomax > 0 && mi->memos.size() >= mi->memomax && !is_servoper) { if (z == 0 || z == 3) - notice_lang(s_MemoServ, u, MEMO_X_HAS_TOO_MANY_MEMOS, name); + notice_lang(Config.s_MemoServ, u, MEMO_X_HAS_TOO_MANY_MEMOS, name); } else { u->lastmemosend = now; @@ -270,12 +270,12 @@ void memo_send(User * u, const char *name, const char *text, int z) if (z == 3) m->SetFlag(MF_RECEIPT); if (z == 0 || z == 3) - notice_lang(s_MemoServ, u, MEMO_SENT, name); + notice_lang(Config.s_MemoServ, u, MEMO_SENT, name); if (!ischan) { NickAlias *na; NickCore *nc = (findnick(name))->nc; - if (MSNotifyAll) { + if (Config.MSNotifyAll) { if ((nc->HasFlag(NI_MEMO_RECEIVE)) && get_ignore(name) == NULL) { int i; @@ -283,15 +283,15 @@ void memo_send(User * u, const char *name, const char *text, int z) for (i = 0; i < nc->aliases.count; i++) { na = static_cast<NickAlias *>(nc->aliases.list[i]); if (finduser(na->nick) && nick_identified(finduser(na->nick))) - notice_lang(s_MemoServ, finduser(na->nick), + notice_lang(Config.s_MemoServ, finduser(na->nick), MEMO_NEW_MEMO_ARRIVED, source, - s_MemoServ, m->number); + Config.s_MemoServ, m->number); } } else { if ((u = finduser(name)) && nick_identified(u) && (nc->HasFlag(NI_MEMO_RECEIVE))) - notice_lang(s_MemoServ, u, MEMO_NEW_MEMO_ARRIVED, - source, s_MemoServ, m->number); + notice_lang(Config.s_MemoServ, u, MEMO_NEW_MEMO_ARRIVED, + source, Config.s_MemoServ, m->number); } /* if (flags & MEMO_RECEIVE) */ } /* if (MSNotifyAll) */ @@ -302,16 +302,16 @@ void memo_send(User * u, const char *name, const char *text, int z) struct c_userlist *cu, *next; Channel *c; - if (MSNotifyAll && (c = findchan(name))) { + if (Config.MSNotifyAll && (c = findchan(name))) { for (cu = c->users; cu; cu = next) { next = cu->next; if (check_access(cu->user, c->ci, CA_MEMO)) { if (cu->user->nc && (cu->user->nc->HasFlag(NI_MEMO_RECEIVE)) && get_ignore(cu->user->nick) == NULL) { - notice_lang(s_MemoServ, cu->user, + notice_lang(Config.s_MemoServ, cu->user, MEMO_NEW_X_MEMO_ARRIVED, - c->ci->name, s_MemoServ, + c->ci->name, Config.s_MemoServ, c->ci->name, m->number); } } @@ -417,7 +417,7 @@ void rsend_notify(User * u, Memo * m, const char *chan) /* Notify recepient of the memo that a notification has been sent to the sender */ - notice_lang(s_MemoServ, u, MEMO_RSEND_USER_NOTIFICATION, + notice_lang(Config.s_MemoServ, u, MEMO_RSEND_USER_NOTIFICATION, nc->display); } diff --git a/src/messages.c b/src/messages.c index 67377a0da..2e00a03f0 100644 --- a/src/messages.c +++ b/src/messages.c @@ -44,7 +44,7 @@ int m_kill(const char *nick, const char *msg) BotInfo *bi; /* Recover if someone kills us. */ - if (s_BotServ && (bi = findbot(nick))) + if (Config.s_BotServ && (bi = findbot(nick))) { introduce_user(nick); bi->RejoinAll(); @@ -70,7 +70,7 @@ int m_time(const char *source, int ac, const char **av) time(&t); tm = localtime(&t); strftime(buf, sizeof(buf), "%a %b %d %H:%M:%S %Y %Z", tm); - ircdproto->SendNumeric(ServerName, 391, source, "%s :%s", ServerName, buf); + ircdproto->SendNumeric(Config.ServerName, 391, source, "%s :%s", Config.ServerName, buf); return MOD_CONT; } @@ -85,17 +85,17 @@ int m_motd(const char *source) return MOD_CONT; } - f = fopen(MOTDFilename, "r"); + f = fopen(Config.MOTDFilename, "r"); if (f) { - ircdproto->SendNumeric(ServerName, 375, source, ":- %s Message of the Day", ServerName); + ircdproto->SendNumeric(Config.ServerName, 375, source, ":- %s Message of the Day", Config.ServerName); while (fgets(buf, sizeof(buf), f)) { buf[strlen(buf) - 1] = 0; - ircdproto->SendNumeric(ServerName, 372, source, ":- %s", buf); + ircdproto->SendNumeric(Config.ServerName, 372, source, ":- %s", buf); } fclose(f); - ircdproto->SendNumeric(ServerName, 376, source, ":End of /MOTD command."); + ircdproto->SendNumeric(Config.ServerName, 376, source, ":End of /MOTD command."); } else { - ircdproto->SendNumeric(ServerName, 422, source, ":- MOTD file not found! Please contact your IRC administrator."); + ircdproto->SendNumeric(Config.ServerName, 422, source, ":- MOTD file not found! Please contact your IRC administrator."); } return MOD_CONT; } @@ -128,7 +128,7 @@ int m_privmsg(const char *source, const char *receiver, const char *msg) } if (*receiver == '#') { - if (s_BotServ && (ci = cs_findchan(receiver))) { + if (Config.s_BotServ && (ci = cs_findchan(receiver))) { /* Some paranoia checks */ if (!ci->HasFlag(CI_FORBIDDEN) && ci->c && ci->bi) { botchanmsgs(u, ci, const_cast<char *>(msg)); // XXX Unsafe cast, this needs reviewing -- CyberBotX @@ -151,14 +151,14 @@ int m_privmsg(const char *source, const char *receiver, const char *msg) s = const_cast<char *>(strchr(receiver, '@')); if (s) { *s++ = 0; - if (stricmp(s, ServerName) != 0) + if (stricmp(s, Config.ServerName) != 0) return MOD_CONT; - } else if (UseStrictPrivMsg) { + } else if (Config.UseStrictPrivMsg) { if (debug) { alog("Ignored PRIVMSG without @ from %s", source); } notice_lang(receiver, u, INVALID_TARGET, receiver, receiver, - ServerName, receiver); + Config.ServerName, receiver); return MOD_CONT; } @@ -168,33 +168,33 @@ int m_privmsg(const char *source, const char *receiver, const char *msg) if (bi) { - if (!stricmp(bi->nick, s_OperServ)) + if (!stricmp(bi->nick, Config.s_OperServ)) { - if (!is_oper(u) && OSOpersOnly) + if (!is_oper(u) && Config.OSOpersOnly) { - notice_lang(s_OperServ, u, ACCESS_DENIED); - if (WallBadOS) - ircdproto->SendGlobops(s_OperServ, "Denied access to %s from %s!%s@%s (non-oper)", s_OperServ, u->nick, u->GetIdent().c_str(), u->host); + notice_lang(Config.s_OperServ, u, ACCESS_DENIED); + if (Config.WallBadOS) + ircdproto->SendGlobops(Config.s_OperServ, "Denied access to %s from %s!%s@%s (non-oper)", Config.s_OperServ, u->nick, u->GetIdent().c_str(), u->host); } else operserv(u, const_cast<char *>(msg)); // XXX Unsafe cast, this needs reviewing -- CyberBotX } - else if (!stricmp(bi->nick, s_NickServ)) + else if (!stricmp(bi->nick, Config.s_NickServ)) nickserv(u, const_cast<char *>(msg)); // XXX Unsafe cast, this needs reviewing -- CyberBotX - else if (!stricmp(bi->nick, s_ChanServ)) + else if (!stricmp(bi->nick, Config.s_ChanServ)) { - if (!is_oper(u) && CSOpersOnly) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + if (!is_oper(u) && Config.CSOpersOnly) + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else chanserv(u, const_cast<char *>(msg)); // XXX Unsafe cast, this needs reviewing -- CyberBotX } - else if (!stricmp(bi->nick, s_MemoServ)) + else if (!stricmp(bi->nick, Config.s_MemoServ)) memoserv(u, const_cast<char *>(msg)); // XXX Unsafe cast, this needs reviewing -- CyberBotX - else if (s_HostServ && !stricmp(bi->nick, s_HostServ)) + else if (Config.s_HostServ && !stricmp(bi->nick, Config.s_HostServ)) hostserv(u, const_cast<char *>(msg)); // XXX Unsafe cast, this needs reviewing -- CyberBotX - else if (s_BotServ) + else if (Config.s_BotServ) { - if (!stricmp(bi->nick, s_BotServ)) + if (!stricmp(bi->nick, Config.s_BotServ)) botserv(u, const_cast<char *>(msg)); // XXX Unsafe cast, this needs reviewing -- CyberBotX else botmsgs(u, bi, const_cast<char *>(msg)); // XXX Unsafe cast, this needs reviewing -- CyberBotX @@ -227,46 +227,46 @@ int m_stats(const char *source, int ac, const char **av) if (u && is_oper(u)) { - ircdproto->SendNumeric(ServerName, 211, source, "Server SendBuf SentBytes SentMsgs RecvBuf RecvBytes RecvMsgs ConnTime"); - ircdproto->SendNumeric(ServerName, 211, source, "%s %d %d %d %d %d %d %ld", uplink_server->host, write_buffer_len(), total_written, -1, read_buffer_len(), + ircdproto->SendNumeric(Config.ServerName, 211, source, "Server SendBuf SentBytes SentMsgs RecvBuf RecvBytes RecvMsgs ConnTime"); + ircdproto->SendNumeric(Config.ServerName, 211, source, "%s %d %d %d %d %d %d %ld", uplink_server->host, write_buffer_len(), total_written, -1, read_buffer_len(), total_read, -1, time(NULL) - start_time); } - ircdproto->SendNumeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*'); + ircdproto->SendNumeric(Config.ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*'); break; case 'o': case 'O': /* Check whether the user is an operator */ u = finduser(source); - if (u && !is_oper(u) && HideStatsO) { - ircdproto->SendNumeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*'); + if (u && !is_oper(u) && Config.HideStatsO) { + ircdproto->SendNumeric(Config.ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*'); } else { std::list<std::pair<std::string, std::string> >::iterator it; - for (it = svsopers_in_config.begin(); it != svsopers_in_config.end(); ++it) + for (it = Config.Opers.begin(); it != Config.Opers.end(); ++it) { std::string nick = it->first, type = it->second; if ((nc = findcore(nick.c_str()))) - ircdproto->SendNumeric(ServerName, 243, source, "O * * %s %s 0", nick.c_str(), type.c_str()); + ircdproto->SendNumeric(Config.ServerName, 243, source, "O * * %s %s 0", nick.c_str(), type.c_str()); } - ircdproto->SendNumeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*'); + ircdproto->SendNumeric(Config.ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*'); } break; case 'u':{ int uptime = time(NULL) - start_time; - ircdproto->SendNumeric(ServerName, 242, source, ":Services up %d day%s, %02d:%02d:%02d", uptime / 86400, uptime / 86400 == 1 ? "" : "s", + ircdproto->SendNumeric(Config.ServerName, 242, source, ":Services up %d day%s, %02d:%02d:%02d", uptime / 86400, uptime / 86400 == 1 ? "" : "s", (uptime / 3600) % 24, (uptime / 60) % 60, uptime % 60); - ircdproto->SendNumeric(ServerName, 250, source, ":Current users: %d (%d ops); maximum %d", usercnt, opcnt, maxusercnt); - ircdproto->SendNumeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*'); + ircdproto->SendNumeric(Config.ServerName, 250, source, ":Current users: %d (%d ops); maximum %d", usercnt, opcnt, maxusercnt); + ircdproto->SendNumeric(Config.ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*'); break; } /* case 'u' */ default: - ircdproto->SendNumeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*'); + ircdproto->SendNumeric(Config.ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*'); break; } return MOD_CONT; @@ -276,8 +276,8 @@ int m_stats(const char *source, int ac, const char **av) int m_version(const char *source, int ac, const char **av) { - if (source) ircdproto->SendNumeric(ServerName, 351, source, "Anope-%s %s :%s - %s (%s) -- %s", version_number, ServerName, ircd->name, version_flags, - EncModuleList.begin()->c_str(), version_build); + if (source) ircdproto->SendNumeric(Config.ServerName, 351, source, "Anope-%s %s :%s - %s (%s) -- %s", version_number, Config.ServerName, ircd->name, version_flags, + Config.EncModuleList.begin()->c_str(), version_build); return MOD_CONT; } @@ -291,45 +291,45 @@ int m_whois(const char *source, const char *who) const char *clientdesc; if (source && who) { - if (stricmp(who, s_NickServ) == 0) - clientdesc = desc_NickServ; - else if (stricmp(who, s_ChanServ) == 0) - clientdesc = desc_ChanServ; - else if (stricmp(who, s_MemoServ) == 0) - clientdesc = desc_MemoServ; - else if (s_BotServ && stricmp(who, s_BotServ) == 0) - clientdesc = desc_BotServ; - else if (s_HostServ && stricmp(who, s_HostServ) == 0) - clientdesc = desc_HostServ; - else if (stricmp(who, s_OperServ) == 0) - clientdesc = desc_OperServ; - else if (stricmp(who, s_GlobalNoticer) == 0) - clientdesc = desc_GlobalNoticer; - else if (s_BotServ && (bi = findbot(who))) { + if (stricmp(who, Config.s_NickServ) == 0) + clientdesc = Config.desc_NickServ; + else if (stricmp(who, Config.s_ChanServ) == 0) + clientdesc = Config.desc_ChanServ; + else if (stricmp(who, Config.s_MemoServ) == 0) + clientdesc = Config.desc_MemoServ; + else if (Config.s_BotServ && stricmp(who, Config.s_BotServ) == 0) + clientdesc = Config.desc_BotServ; + else if (Config.s_HostServ && stricmp(who, Config.s_HostServ) == 0) + clientdesc = Config.desc_HostServ; + else if (stricmp(who, Config.s_OperServ) == 0) + clientdesc = Config.desc_OperServ; + else if (stricmp(who, Config.s_GlobalNoticer) == 0) + clientdesc = Config.desc_GlobalNoticer; + else if (Config.s_BotServ && (bi = findbot(who))) { /* Bots are handled separately */ - ircdproto->SendNumeric(ServerName, 311, source, "%s %s %s * :%s", bi->nick, bi->user, bi->host, bi->real); - ircdproto->SendNumeric(ServerName, 307, source, "%s :is a registered nick", bi->nick); - ircdproto->SendNumeric(ServerName, 312, source, "%s %s :%s", bi->nick, ServerName, ServerDesc); - ircdproto->SendNumeric(ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", bi->nick, time(NULL) - bi->lastmsg, start_time); - ircdproto->SendNumeric(ServerName, 318, source, "%s :End of /WHOIS list.", who); + ircdproto->SendNumeric(Config.ServerName, 311, source, "%s %s %s * :%s", bi->nick, bi->user, bi->host, bi->real); + ircdproto->SendNumeric(Config.ServerName, 307, source, "%s :is a registered nick", bi->nick); + ircdproto->SendNumeric(Config.ServerName, 312, source, "%s %s :%s", bi->nick, Config.ServerName, Config.ServerDesc); + ircdproto->SendNumeric(Config.ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", bi->nick, time(NULL) - bi->lastmsg, start_time); + ircdproto->SendNumeric(Config.ServerName, 318, source, "%s :End of /WHOIS list.", who); return MOD_CONT; } else if (!ircd->svshold && (na = findnick(who)) && na->HasFlag(NS_KILL_HELD)) { /* We have a nick enforcer client here that we need to respond to. * We can't just say it doesn't exist here, even tho it does for * other servers :) -GD */ - ircdproto->SendNumeric(ServerName, 311, source, "%s %s %s * :Services Enforcer", na->nick, NSEnforcerUser, NSEnforcerHost); - ircdproto->SendNumeric(ServerName, 312, source, "%s %s :%s", na->nick, ServerName, ServerDesc); - ircdproto->SendNumeric(ServerName, 318, source, "%s :End of /WHOIS list.", who); + ircdproto->SendNumeric(Config.ServerName, 311, source, "%s %s %s * :Services Enforcer", na->nick, Config.NSEnforcerUser, Config.NSEnforcerHost); + ircdproto->SendNumeric(Config.ServerName, 312, source, "%s %s :%s", na->nick, Config.ServerName, Config.ServerDesc); + ircdproto->SendNumeric(Config.ServerName, 318, source, "%s :End of /WHOIS list.", who); return MOD_CONT; } else { - ircdproto->SendNumeric(ServerName, 401, source, "%s :No such service.", who); + ircdproto->SendNumeric(Config.ServerName, 401, source, "%s :No such service.", who); return MOD_CONT; } - ircdproto->SendNumeric(ServerName, 311, source, "%s %s %s * :%s", who, ServiceUser, ServiceHost, clientdesc); - ircdproto->SendNumeric(ServerName, 312, source, "%s %s :%s", who, ServerName, ServerDesc); - ircdproto->SendNumeric(ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", who, time(NULL) - start_time, start_time); - ircdproto->SendNumeric(ServerName, 318, source, "%s :End of /WHOIS list.", who); + ircdproto->SendNumeric(Config.ServerName, 311, source, "%s %s %s * :%s", who, Config.ServiceUser, Config.ServiceHost, clientdesc); + ircdproto->SendNumeric(Config.ServerName, 312, source, "%s %s :%s", who, Config.ServerName, Config.ServerDesc); + ircdproto->SendNumeric(Config.ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", who, time(NULL) - start_time, start_time); + ircdproto->SendNumeric(Config.ServerName, 318, source, "%s :End of /WHOIS list.", who); } return MOD_CONT; } diff --git a/src/misc.c b/src/misc.c index c0ab1954c..16a7abfe7 100644 --- a/src/misc.c +++ b/src/misc.c @@ -787,27 +787,27 @@ int nickIsServices(const char *tempnick, int bot) s = strchr(nick, '@'); if (s) { *s++ = 0; - if (stricmp(s, ServerName) != 0) { + if (stricmp(s, Config.ServerName) != 0) { delete [] nick; return found; } } - if (s_NickServ && (stricmp(nick, s_NickServ) == 0)) + if (Config.s_NickServ && (stricmp(nick, Config.s_NickServ) == 0)) found++; - else if (s_ChanServ && (stricmp(nick, s_ChanServ) == 0)) + else if (Config.s_ChanServ && (stricmp(nick, Config.s_ChanServ) == 0)) found++; - else if (s_HostServ && (stricmp(nick, s_HostServ) == 0)) + else if (Config.s_HostServ && (stricmp(nick, Config.s_HostServ) == 0)) found++; - else if (s_MemoServ && (stricmp(nick, s_MemoServ) == 0)) + else if (Config.s_MemoServ && (stricmp(nick, Config.s_MemoServ) == 0)) found++; - else if (s_BotServ && (stricmp(nick, s_BotServ) == 0)) + else if (Config.s_BotServ && (stricmp(nick, Config.s_BotServ) == 0)) found++; - else if (s_OperServ && (stricmp(nick, s_OperServ) == 0)) + else if (Config.s_OperServ && (stricmp(nick, Config.s_OperServ) == 0)) found++; - else if (s_GlobalNoticer && (stricmp(nick, s_GlobalNoticer) == 0)) + else if (Config.s_GlobalNoticer && (stricmp(nick, Config.s_GlobalNoticer) == 0)) found++; - else if (s_BotServ && bot) { + else if (Config.s_BotServ && bot) { BotInfo *bi; int i; for (i = 0; i < 256; i++) { @@ -915,9 +915,9 @@ void rand_init() */ void add_entropy_userkeys() { - arc4_addrandom(&UserKey1, sizeof(UserKey1)); - arc4_addrandom(&UserKey2, sizeof(UserKey2)); - arc4_addrandom(&UserKey3, sizeof(UserKey3)); + arc4_addrandom(&Config.UserKey1, sizeof(Config.UserKey1)); + arc4_addrandom(&Config.UserKey2, sizeof(Config.UserKey2)); + arc4_addrandom(&Config.UserKey3, sizeof(Config.UserKey3)); /* UserKey3 is also used in mysql_rand() */ } diff --git a/src/modes.cpp b/src/modes.cpp index 463e82945..7094b79b1 100644 --- a/src/modes.cpp +++ b/src/modes.cpp @@ -226,8 +226,8 @@ void ChannelModeBan::AddMask(Channel *chan, const char *mask) /* Check whether it matches a botserv bot after adding internally * and parsing it through cidr support. ~ Viper */ - if (s_BotServ && BSSmartJoin && chan->ci && chan->ci->bi - && chan->usercount >= BSMinUsers) + if (Config.s_BotServ && Config.BSSmartJoin && chan->ci && chan->ci->bi + && chan->usercount >= Config.BSMinUsers) { BotInfo *bi = chan->ci->bi; diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index 738c2f4ec..2c0694edc 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -246,8 +246,8 @@ int ModuleManager::LoadModule(const std::string &modname, User * u) if (u) { - ircdproto->SendGlobops(s_OperServ, "%s loaded module %s", u->nick, modname.c_str()); - notice_lang(s_OperServ, u, OPER_MODULE_LOADED, modname.c_str()); + ircdproto->SendGlobops(Config.s_OperServ, "%s loaded module %s", u->nick, modname.c_str()); + notice_lang(Config.s_OperServ, u, OPER_MODULE_LOADED, modname.c_str()); /* If a user is loading this module, then the core databases have already been loaded * so trigger the event manually @@ -263,21 +263,21 @@ int ModuleManager::UnloadModule(Module *m, User *u) if (!m || !m->handle) { if (u) - notice_lang(s_OperServ, u, OPER_MODULE_REMOVE_FAIL, m->name.c_str()); + notice_lang(Config.s_OperServ, u, OPER_MODULE_REMOVE_FAIL, m->name.c_str()); return MOD_ERR_PARAMS; } if (m->GetPermanent() || m->type == PROTOCOL || m->type == ENCRYPTION) { if (u) - notice_lang(s_OperServ, u, OPER_MODULE_NO_UNLOAD); + notice_lang(Config.s_OperServ, u, OPER_MODULE_NO_UNLOAD); return MOD_ERR_NOUNLOAD; } if (u) { - ircdproto->SendGlobops(s_OperServ, "%s unloaded module %s", u->nick, m->name.c_str()); - notice_lang(s_OperServ, u, OPER_MODULE_UNLOADED, m->name.c_str()); + ircdproto->SendGlobops(Config.s_OperServ, "%s unloaded module %s", u->nick, m->name.c_str()); + notice_lang(Config.s_OperServ, u, OPER_MODULE_UNLOADED, m->name.c_str()); } DeleteModule(m); diff --git a/src/modules.c b/src/modules.c index 6a65da2eb..49f4b42f7 100644 --- a/src/modules.c +++ b/src/modules.c @@ -60,19 +60,19 @@ int protocol_module_init() { int ret = 0; - alog("Loading IRCD Protocol Module: [%s]", IRCDModule); - ret = ModuleManager::LoadModule(IRCDModule, NULL); + alog("Loading IRCD Protocol Module: [%s]", Config.IRCDModule); + ret = ModuleManager::LoadModule(Config.IRCDModule, NULL); if (ret == MOD_ERR_OK) { - findModule(IRCDModule)->SetType(PROTOCOL); + findModule(Config.IRCDModule)->SetType(PROTOCOL); /* This is really NOT the correct place to do config checks, but * as we only have the ircd struct filled here, we have to over * here. -GD */ if (ircd->ts6) { - if (!Numeric) + if (!Config.Numeric) { alog("This IRCd protocol requires a server id to be set in Anope's configuration."); ret = -1; @@ -220,38 +220,38 @@ int Module::AddCommand(CommandHash * cmdTable[], Command * c) if (cmdTable == HOSTSERV) { - if (s_HostServ) { - c->service = sstrdup(s_HostServ); + if (Config.s_HostServ) { + c->service = sstrdup(Config.s_HostServ); } else { return MOD_ERR_NOSERVICE; } } else if (cmdTable == BOTSERV) { - if (s_BotServ) { - c->service = sstrdup(s_BotServ); + if (Config.s_BotServ) { + c->service = sstrdup(Config.s_BotServ); } else { return MOD_ERR_NOSERVICE; } } else if (cmdTable == MEMOSERV) { - if (s_MemoServ) { - c->service = sstrdup(s_MemoServ); + if (Config.s_MemoServ) { + c->service = sstrdup(Config.s_MemoServ); } else { return MOD_ERR_NOSERVICE; } } else if (cmdTable == CHANSERV) { - if (s_ChanServ) { - c->service = sstrdup(s_ChanServ); + if (Config.s_ChanServ) { + c->service = sstrdup(Config.s_ChanServ); } else { return MOD_ERR_NOSERVICE; } } else if (cmdTable == NICKSERV) { - if (s_NickServ) { - c->service = sstrdup(s_NickServ); + if (Config.s_NickServ) { + c->service = sstrdup(Config.s_NickServ); } else { return MOD_ERR_NOSERVICE; } } else if (cmdTable == OPERSERV) { - if (s_OperServ) { - c->service = sstrdup(s_OperServ); + if (Config.s_OperServ) { + c->service = sstrdup(Config.s_OperServ); } else { return MOD_ERR_NOSERVICE; } @@ -688,7 +688,7 @@ void Module::NoticeLang(const char *source, User * u, int number, ...) va_list va; char buffer[4096], outbuf[4096]; char *fmt = NULL; - int mlang = NSDefLanguage; + int mlang = Config.NSDefLanguage; char *s, *t, *buf; /* Find the users lang, and use it if we can */ @@ -727,7 +727,7 @@ void Module::NoticeLang(const char *source, User * u, int number, ...) const char *Module::GetLangString(User * u, int number) { - int mlang = NSDefLanguage; + int mlang = Config.NSDefLanguage; /* Find the users lang, and use it if we can */ if (u && u->nc) diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c index 7e050fd57..96cef82b7 100644 --- a/src/modules/cs_appendtopic.c +++ b/src/modules/cs_appendtopic.c @@ -69,9 +69,9 @@ class CommandCSAppendTopic : public Command ci = c->ci; if (!c) - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); else if (!check_access(u, ci, CA_TOPIC)) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else { if (ci->last_topic) @@ -96,20 +96,20 @@ class CommandCSAppendTopic : public Command c->topic_time = ci->last_topic_time; if (!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); + alog("%s: %s!%s@%s changed topic of %s as services admin.", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, c->name); if (ircd->join2set) { - if (whosends(ci) == findbot(s_ChanServ)) + if (whosends(ci) == findbot(Config.s_ChanServ)) { - ircdproto->SendJoin(findbot(s_ChanServ), c->name, c->creation_time); - ircdproto->SendMode(NULL, c->name, "+o %s", s_ChanServ); + ircdproto->SendJoin(findbot(Config.s_ChanServ), c->name, c->creation_time); + ircdproto->SendMode(NULL, c->name, "+o %s", Config.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 (whosends(ci) == findbot(Config.s_ChanServ)) + ircdproto->SendPart(findbot(Config.s_ChanServ), c->name, NULL); } } return MOD_CONT; @@ -117,16 +117,16 @@ class CommandCSAppendTopic : public Command bool OnHelp(User *u, const ci::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); + me->NoticeLang(Config.s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX); + ircdproto->SendMessage(findbot(Config.s_ChanServ), u->nick, " "); + me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP_APPENDTOPIC); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - me->NoticeLang(s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX); + me->NoticeLang(Config.s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX); } }; @@ -227,7 +227,7 @@ class CSAppendTopic : public Module } void OnChanServHelp(User *u) { - this->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP); + this->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP); } }; diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c index 0c384a237..6937d4dc8 100644 --- a/src/modules/cs_enforce.c +++ b/src/modules/cs_enforce.c @@ -123,12 +123,12 @@ class CommandCSEnforce : public Command av[1] = mask; reason = getstring(u, CHAN_NOT_ALLOWED_TO_JOIN); ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask, time(NULL)); - chan_set_modes(s_ChanServ, c, 2, av, 1); + chan_set_modes(Config.s_ChanServ, c, 2, av, 1); 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); + do_kick(Config.s_ChanServ, 3, av); } user = next; } while (user); @@ -166,13 +166,13 @@ class CommandCSEnforce : public Command if (!c->HasMode(CMODE_REGISTERED)) { ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask, time(NULL)); - chan_set_modes(s_ChanServ, c, 2, av, 1); + chan_set_modes(Config.s_ChanServ, c, 2, av, 1); } 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); + do_kick(Config.s_ChanServ, 3, av); } user = next; } while (user); @@ -193,35 +193,35 @@ class CommandCSEnforce : public Command ci = c->ci; if (!c) - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); else if (!check_access(u, ci, CA_AKICK)) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else { if (what.empty() || what == "SET") { this->DoSet(c); - me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, !what.empty() ? what.c_str() : "SET"); + me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_RESPONSE, !what.empty() ? what.c_str() : "SET"); } else if (what == "MODES") { this->DoModes(c); - me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); + me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); } else if (what == "SECUREOPS") { this->DoSecureOps(c); - me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); + me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); } else if (what == "RESTRICTED") { this->DoRestricted(c); - me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); + me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); } else if (what == "+R") { this->DoCModeR(c); - me->NoticeLang(s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); + me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); } else this->OnSyntaxError(u, ""); @@ -232,21 +232,21 @@ class CommandCSEnforce : public Command bool OnHelp(User *u, const ci::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, " "); + me->NoticeLang(Config.s_ChanServ, u, LNG_ENFORCE_SYNTAX); + ircdproto->SendMessage(findbot(Config.s_ChanServ), u->nick, " "); + me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP_ENFORCE); + ircdproto->SendMessage(findbot(Config.s_ChanServ), u->nick, " "); if (ModeManager::FindChannelModeByName(CMODE_REGISTERED)) - me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED); + me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED); else - me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_DISABLED); + me->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_DISABLED); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - me->NoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX); + me->NoticeLang(Config.s_ChanServ, u, LNG_ENFORCE_SYNTAX); } }; @@ -475,7 +475,7 @@ class CSEnforce : public Module } void OnChanServHelp(User *u) { - this->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP); + this->NoticeLang(Config.s_ChanServ, u, LNG_CHAN_HELP); } }; diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c index 3368955b4..7da2a90ed 100644 --- a/src/modules/cs_tban.c +++ b/src/modules/cs_tban.c @@ -54,9 +54,9 @@ class CommandCSTBan : public Command const char *time = params[2].c_str(); if (!(c = findchan(chan))) - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + notice_lang(Config.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); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, nick); else { if (canBanUser(c, u, u2)) @@ -73,15 +73,15 @@ class CommandCSTBan : public Command bool OnHelp(User *u, const ci::string &subcommand) { this->OnSyntaxError(u, ""); - ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " "); - me->NoticeLang(s_ChanServ, u, TBAN_HELP_DETAIL); + ircdproto->SendMessage(findbot(Config.s_ChanServ), u->nick, " "); + me->NoticeLang(Config.s_ChanServ, u, TBAN_HELP_DETAIL); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - me->NoticeLang(s_ChanServ, u, TBAN_SYNTAX); + me->NoticeLang(Config.s_ChanServ, u, TBAN_SYNTAX); } }; @@ -159,13 +159,13 @@ class CSTBan : public Module } void OnChanServHelp(User *u) { - this->NoticeLang(s_ChanServ, u, TBAN_HELP); + this->NoticeLang(Config.s_ChanServ, u, TBAN_HELP); } }; void mySendResponse(User *u, const char *channel, char *mask, const char *time) { - me->NoticeLang(s_ChanServ, u, TBAN_RESPONSE, mask, channel, time); + me->NoticeLang(Config.s_ChanServ, u, TBAN_RESPONSE, mask, channel, time); } class TempBan : public Timer @@ -188,7 +188,7 @@ class TempBan : public Timer if ((c = findchan(chan.c_str())) && c->ci) { ircdproto->SendMode(whosends(c->ci), c->name, "-b %s", av[1]); - chan_set_modes(s_ChanServ, c, 2, av, 1); + chan_set_modes(Config.s_ChanServ, c, 2, av, 1); } } }; @@ -205,7 +205,7 @@ void addBan(Channel *c, time_t timeout, char *banmask) av[1] = banmask; ircdproto->SendMode(whosends(c->ci), c->name, "+b %s", av[1]); - chan_set_modes(s_ChanServ, c, 2, av, 1); + chan_set_modes(Config.s_ChanServ, c, 2, av, 1); me->AddCallBack(new TempBan(timeout, c->name, banmask)); } @@ -215,11 +215,11 @@ int canBanUser(Channel * c, User * u, User * u2) ChannelInfo *ci = c->ci; int ok = 0; if (!check_access(u, ci, CA_BAN)) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (is_excepted(ci, u2)) - notice_lang(s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name); else if (is_protected(u2)) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else ok = 1; diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c index c2d42d4aa..4d01ee93d 100644 --- a/src/modules/hs_request.c +++ b/src/modules/hs_request.c @@ -93,13 +93,13 @@ class CommandHSRequest : public Command rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */ if (!rawhostmask) { - me->NoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); + me->NoticeLang(Config.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); + notice_lang(Config.s_HostServ, u, HOST_SET_IDENTTOOLONG, USERMAX); delete [] vIdent; delete [] rawhostmask; return MOD_CONT; @@ -110,7 +110,7 @@ class CommandHSRequest : public Command { if (!my_isvalidchar(*s)) { - notice_lang(s_HostServ, u, HOST_SET_IDENT_ERROR); + notice_lang(Config.s_HostServ, u, HOST_SET_IDENT_ERROR); delete [] vIdent; delete [] rawhostmask; return MOD_CONT; @@ -119,7 +119,7 @@ class CommandHSRequest : public Command } if (!ircd->vident) { - notice_lang(s_HostServ, u, HOST_NO_VIDENT); + notice_lang(Config.s_HostServ, u, HOST_NO_VIDENT); delete [] vIdent; delete [] rawhostmask; return MOD_CONT; @@ -129,7 +129,7 @@ class CommandHSRequest : public Command snprintf(hostmask, HOSTMAX, "%s", rawhostmask); else { - notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX); + notice_lang(Config.s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX); if (vIdent) { delete [] vIdent; @@ -140,7 +140,7 @@ class CommandHSRequest : public Command if (!isValidHost(hostmask, 3)) { - notice_lang(s_HostServ, u, HOST_SET_ERROR); + notice_lang(Config.s_HostServ, u, HOST_SET_ERROR); if (vIdent) { delete [] vIdent; @@ -154,9 +154,9 @@ class CommandHSRequest : public Command { if (HSRequestMemoOper || HSRequestMemoSetters) { - if (MSSendDelay > 0 && u && u->lastmemosend + MSSendDelay > now) + if (Config.MSSendDelay > 0 && u && u->lastmemosend + Config.MSSendDelay > now) { - me->NoticeLang(s_HostServ, u, LNG_REQUEST_WAIT, MSSendDelay); + me->NoticeLang(Config.s_HostServ, u, LNG_REQUEST_WAIT, Config.MSSendDelay); u->lastmemosend = now; if (vIdent) { @@ -168,12 +168,12 @@ class CommandHSRequest : public Command } my_add_host_request(nick, vIdent, hostmask, u->nick, tmp_time); - me->NoticeLang(s_HostServ, u, LNG_REQUESTED); + me->NoticeLang(Config.s_HostServ, u, LNG_REQUESTED); req_send_memos(u, vIdent, hostmask); alog("New vHost Requested by %s", nick); } else - notice_lang(s_HostServ, u, HOST_NOREG, nick); + notice_lang(Config.s_HostServ, u, HOST_NOREG, nick); if (vIdent) { @@ -186,16 +186,16 @@ class CommandHSRequest : public Command bool OnHelp(User *u, const ci::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); + me->NoticeLang(Config.s_HostServ, u, LNG_REQUEST_SYNTAX); + ircdproto->SendMessage(findbot(Config.s_HostServ), u->nick, " "); + me->NoticeLang(Config.s_HostServ, u, LNG_HELP_REQUEST); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - me->NoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX); + me->NoticeLang(Config.s_HostServ, u, LNG_REQUEST_SYNTAX); } }; @@ -210,7 +210,7 @@ class CommandHSActivate : public Command { if (!u->nc->HasPriv("hostserv/set")) { - notice_lang(s_HostServ, u, ACCESS_DENIED); + notice_lang(Config.s_HostServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -235,32 +235,32 @@ class CommandHSActivate : public Command 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); + me->NoticeLang(Config.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); + me->NoticeLang(Config.s_HostServ, u, LNG_NO_REQUEST, nick); } else - notice_lang(s_HostServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_HostServ, u, NICK_X_NOT_REGISTERED, nick); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - me->NoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX); - ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); - me->NoticeLang(s_HostServ, u, LNG_HELP_ACTIVATE); + me->NoticeLang(Config.s_HostServ, u, LNG_ACTIVATE_SYNTAX); + ircdproto->SendMessage(findbot(Config.s_HostServ), u->nick, " "); + me->NoticeLang(Config.s_HostServ, u, LNG_HELP_ACTIVATE); if (HSRequestMemoUser) - me->NoticeLang(s_HostServ, u, LNG_HELP_ACTIVATE_MEMO); + me->NoticeLang(Config.s_HostServ, u, LNG_HELP_ACTIVATE_MEMO); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - me->NoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX); + me->NoticeLang(Config.s_HostServ, u, LNG_ACTIVATE_SYNTAX); } }; @@ -275,7 +275,7 @@ class CommandHSReject : public Command { if (!u->nc->HasPriv("hostserv/set")) { - notice_lang(s_HostServ, u, ACCESS_DENIED); + notice_lang(Config.s_HostServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -301,29 +301,29 @@ class CommandHSReject : public Command } hs_request_head = deleteHostCore(hs_request_head, tmp); - me->NoticeLang(s_HostServ, u, LNG_REJECTED, nick); + me->NoticeLang(Config.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); + me->NoticeLang(Config.s_HostServ, u, LNG_NO_REQUEST, nick); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - me->NoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX); - ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); - me->NoticeLang(s_HostServ, u, LNG_HELP_REJECT); + me->NoticeLang(Config.s_HostServ, u, LNG_REJECT_SYNTAX); + ircdproto->SendMessage(findbot(Config.s_HostServ), u->nick, " "); + me->NoticeLang(Config.s_HostServ, u, LNG_HELP_REJECT); if (HSRequestMemoUser) - me->NoticeLang(s_HostServ, u, LNG_HELP_REJECT_MEMO); + me->NoticeLang(Config.s_HostServ, u, LNG_HELP_REJECT_MEMO); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - me->NoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX); + me->NoticeLang(Config.s_HostServ, u, LNG_REJECT_SYNTAX); } }; @@ -334,7 +334,7 @@ class HSListBase : public Command { if (!u->nc->HasPriv("hostserv/set")) { - notice_lang(s_HostServ, u, ACCESS_DENIED); + notice_lang(Config.s_HostServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -348,20 +348,20 @@ class HSListBase : public Command current = hs_request_head; while (current) { - if (((counter >= from && counter <= to) || (!from && !to)) && display_counter < NSListMax) + if (((counter >= from && counter <= to) || (!from && !to)) && display_counter < Config.NSListMax) { ++display_counter; tm = localtime(¤t->time); strftime(buf, sizeof(buf), getstring(u, 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); + notice_lang(Config.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); + notice_lang(Config.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); + notice_lang(Config.s_HostServ, u, HOST_LIST_FOOTER, display_counter); return MOD_CONT; } @@ -390,9 +390,9 @@ class CommandHSWaiting : public HSListBase bool OnHelp(User *u, const ci::string &subcommand) { - me->NoticeLang(s_HostServ, u, LNG_WAITING_SYNTAX); - ircdproto->SendMessage(findbot(s_HostServ), u->nick, " "); - me->NoticeLang(s_HostServ, u, LNG_HELP_WAITING); + me->NoticeLang(Config.s_HostServ, u, LNG_WAITING_SYNTAX); + ircdproto->SendMessage(findbot(Config.s_HostServ), u->nick, " "); + me->NoticeLang(Config.s_HostServ, u, LNG_HELP_WAITING); return true; } @@ -695,7 +695,7 @@ class HSRequest : public Module EventReturn OnPreCommand(User *u, const std::string &service, const ci::string &command, const std::vector<ci::string> ¶ms) { - if (s_HostServ && service == s_HostServ) + if (Config.s_HostServ && service == Config.s_HostServ) { if (command == "LIST") { @@ -710,7 +710,7 @@ class HSRequest : public Module } } } - else if (service == s_NickServ) + else if (service == Config.s_NickServ) { if (command == "DROP") { @@ -769,8 +769,8 @@ class HSRequest : public Module void OnHostServHelp(User *u) { - this->NoticeLang(s_HostServ, u, LNG_HELP); - this->NoticeLang(s_HostServ, u, LNG_HELP_SETTER); + this->NoticeLang(Config.s_HostServ, u, LNG_HELP); + this->NoticeLang(Config.s_HostServ, u, LNG_HELP_SETTER); } }; @@ -831,7 +831,7 @@ void req_send_memos(User *u, char *vIdent, char *vHost) if (HSRequestMemoOper == 1) { - for (it = svsopers_in_config.begin(); it != svsopers_in_config.end(); ++it) + for (it = Config.Opers.begin(); it != Config.Opers.end(); ++it) { std::string nick = it->first; my_memo_lang(u, nick.c_str(), z, LNG_REQUEST_MEMO, host); diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c index a60db4ad7..2a86b1eed 100644 --- a/src/modules/ns_maxemail.c +++ b/src/modules/ns_maxemail.c @@ -103,7 +103,7 @@ class NSMaxEmail : public Module EventReturn OnPreCommand(User *u, const std::string &service, const ci::string &command, const std::vector<ci::string> ¶ms) { - if (service == s_NickServ) + if (service == Config.s_NickServ) { if (command == "REGISTER") { @@ -155,9 +155,9 @@ bool check_email_limit_reached(const char *email, User * u) return false; if (NSEmailMax == 1) - me->NoticeLang(s_NickServ, u, LNG_NSEMAILMAX_REACHED_ONE); + me->NoticeLang(Config.s_NickServ, u, LNG_NSEMAILMAX_REACHED_ONE); else - me->NoticeLang(s_NickServ, u, LNG_NSEMAILMAX_REACHED, NSEmailMax); + me->NoticeLang(Config.s_NickServ, u, LNG_NSEMAILMAX_REACHED, NSEmailMax); return true; } diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c index d5487b360..3989bde85 100644 --- a/src/modules/os_ignore_db.c +++ b/src/modules/os_ignore_db.c @@ -113,7 +113,7 @@ class OSIgnoreDB : public Module IgnoreData *ign, *next; now = time(NULL); - fill_db_ptr(dbptr, 0, IGNOREDBVERSION, s_OperServ, IgnoreDB); + fill_db_ptr(dbptr, 0, IGNOREDBVERSION, Config.s_OperServ, IgnoreDB); /* time to backup the old db */ rename(IgnoreDB, dbptr->temp_name); @@ -197,7 +197,7 @@ void load_ignore_db() { IgnoreData *ign; expiry_time = time(NULL); - fill_db_ptr(dbptr, 0, IGNOREDBVERSION, s_OperServ, IgnoreDB); + fill_db_ptr(dbptr, 0, IGNOREDBVERSION, Config.s_OperServ, IgnoreDB); /* let's remove existing temp files here, because we only load dbs on startup */ remove(dbptr->temp_name); diff --git a/src/modules/os_info.c b/src/modules/os_info.c index 4f64738a4..f439a362f 100644 --- a/src/modules/os_info.c +++ b/src/modules/os_info.c @@ -74,11 +74,11 @@ class CommandNSOInfo : public Command } /* Add the module data to the user */ na->nc->Extend("os_info", sstrdup(info)); - me->NoticeLang(s_NickServ, u, OINFO_ADD_SUCCESS, nick); + me->NoticeLang(Config.s_NickServ, u, OINFO_ADD_SUCCESS, nick); } else /* NickCore not found! */ - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); return MOD_CONT; } @@ -97,11 +97,11 @@ class CommandNSOInfo : public Command na->nc->Shrink("os_info"); } - me->NoticeLang(s_NickServ, u, OINFO_DEL_SUCCESS, nick); + me->NoticeLang(Config.s_NickServ, u, OINFO_DEL_SUCCESS, nick); } else /* NickCore not found! */ - notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); + notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick); return MOD_CONT; } @@ -126,13 +126,13 @@ class CommandNSOInfo : public Command bool OnHelp(User *u, const ci::string &subcommand) { - me->NoticeLang(s_NickServ, u, OINFO_HELP); + me->NoticeLang(Config.s_NickServ, u, OINFO_HELP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - me->NoticeLang(s_NickServ, u, OINFO_SYNTAX); + me->NoticeLang(Config.s_NickServ, u, OINFO_SYNTAX); } }; @@ -159,7 +159,7 @@ class CommandCSOInfo : public Command } /* Add the module data to the channel */ ci->Extend("os_info", sstrdup(info)); - me->NoticeLang(s_ChanServ, u, OCINFO_ADD_SUCCESS, chan); + me->NoticeLang(Config.s_ChanServ, u, OCINFO_ADD_SUCCESS, chan); return MOD_CONT; } @@ -176,7 +176,7 @@ class CommandCSOInfo : public Command delete [] c; ci->Shrink("os_info"); } - me->NoticeLang(s_ChanServ, u, OCINFO_DEL_SUCCESS, chan); + me->NoticeLang(Config.s_ChanServ, u, OCINFO_DEL_SUCCESS, chan); return MOD_CONT; } @@ -200,13 +200,13 @@ class CommandCSOInfo : public Command bool OnHelp(User *u, const ci::string &subcommand) { - me->NoticeLang(s_ChanServ, u, OCINFO_HELP); + me->NoticeLang(Config.s_ChanServ, u, OCINFO_HELP); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - me->NoticeLang(s_ChanServ, u, OCINFO_SYNTAX); + me->NoticeLang(Config.s_ChanServ, u, OCINFO_SYNTAX); } }; @@ -504,7 +504,7 @@ class OSInfo : public Module { if (command == "INFO") { - if (service == s_NickServ) + if (service == Config.s_NickServ) { const char *nick = params[0].c_str(); NickAlias *na = NULL; @@ -516,11 +516,11 @@ class OSInfo : public Module /* If we have any info on this user */ char *c; if (na->nc->GetExt("os_info", c)) - u->SendMessage(s_NickServ, " OperInfo: %s", c); + u->SendMessage(Config.s_NickServ, " OperInfo: %s", c); } } } - else if (service == s_ChanServ) + else if (service == Config.s_ChanServ) { const char *chan = params[0].c_str(); ChannelInfo *ci = NULL; @@ -532,7 +532,7 @@ class OSInfo : public Module /* If we have any info on this channel */ char *c; if (ci->GetExt("os_info", c)) - u->SendMessage(s_ChanServ, " OperInfo: %s", c); + u->SendMessage(Config.s_ChanServ, " OperInfo: %s", c); } } } @@ -550,7 +550,7 @@ class OSInfo : public Module if (!(out = fopen(OSInfoDBName, "w"))) { alog("os_info: ERROR: can not open the database file!"); - ircdproto->SendGlobops(s_OperServ, "os_info: ERROR: can not open the database file!"); + ircdproto->SendGlobops(Config.s_OperServ, "os_info: ERROR: can not open the database file!"); ret = 1; } else @@ -609,12 +609,12 @@ class OSInfo : public Module void OnNickServHelp(User *u) { - this->NoticeLang(s_NickServ, u, OINFO_HELP_CMD); + this->NoticeLang(Config.s_NickServ, u, OINFO_HELP_CMD); } void OnChanServHelp(User *u) { - this->NoticeLang(s_ChanServ, u, OCINFO_HELP_CMD); + this->NoticeLang(Config.s_ChanServ, u, OCINFO_HELP_CMD); } }; diff --git a/src/nickcore.cpp b/src/nickcore.cpp index 425cb0d93..db0445d17 100644 --- a/src/nickcore.cpp +++ b/src/nickcore.cpp @@ -25,7 +25,7 @@ NickCore::NickCore(const std::string &coredisplay) /* Set default nick core flags */ for (size_t t = NI_BEGIN + 1; t != NI_END; ++t) - if (NSDefFlags.HasFlag(static_cast<NickCoreFlag>(t))) + if (Config.NSDefFlags.HasFlag(static_cast<NickCoreFlag>(t))) SetFlag(static_cast<NickCoreFlag>(t)); } @@ -64,7 +64,7 @@ NickCore::~NickCore() nclists[HASH(this->display)] = this->next; /* Log .. */ - alog("%s: deleting nickname group %s", s_NickServ, this->display); + alog("%s: deleting nickname group %s", Config.s_NickServ, this->display); /* Now we can safely free it. */ delete [] this->display; diff --git a/src/nickserv.c b/src/nickserv.c index 36b17aa84..536550045 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -136,7 +136,7 @@ void NickServRelease::ClearTimers(NickAlias *na, bool dorelease) /* *INDENT-OFF* */ void moduleAddNickServCmds() { - ModuleManager::LoadModuleList(NickServCoreModules); + ModuleManager::LoadModuleList(Config.NickServCoreModules); } /* *INDENT-ON* */ /*************************************************************************/ @@ -249,11 +249,11 @@ void nickserv(User * u, char *buf) { s = ""; } - ircdproto->SendCTCP(findbot(s_NickServ), u->nick, "PING %s", s); + ircdproto->SendCTCP(findbot(Config.s_NickServ), u->nick, "PING %s", s); } else { - mod_run_cmd(s_NickServ, u, NICKSERV, cmd); + mod_run_cmd(Config.s_NickServ, u, NICKSERV, cmd); } } @@ -266,7 +266,7 @@ void nickserv(User * u, char *buf) #define SAFE(x) do { \ if ((x) < 0) { \ if (!forceload) \ - fatal("Read error on %s", NickDBName); \ + fatal("Read error on %s", Config.NickDBName); \ failed = 1; \ break; \ } \ @@ -281,7 +281,7 @@ void load_ns_req_db() int failed = 0, len; char *pass; - if (!(f = open_db(s_NickServ, PreNickDBName, "r", PRE_NICK_VERSION))) + if (!(f = open_db(Config.s_NickServ, Config.PreNickDBName, "r", PRE_NICK_VERSION))) return; ver = get_file_version(f); for (i = 0; i < 1024 && !failed; i++) @@ -289,7 +289,7 @@ void load_ns_req_db() while ((c = getc_db(f)) == 1) { if (c != 1) - fatal("Invalid format in %s", PreNickDBName); + fatal("Invalid format in %s", Config.PreNickDBName); char *s; SAFE(read_string(&s, f)); @@ -328,7 +328,7 @@ void load_ns_dbase() uint32 tmp32; char *s; - if (!(f = open_db(s_NickServ, NickDBName, "r", NICK_VERSION))) + if (!(f = open_db(Config.s_NickServ, Config.NickDBName, "r", NICK_VERSION))) return; ver = get_file_version(f); @@ -336,7 +336,7 @@ void load_ns_dbase() if (ver != 14) { close_db(f); - fatal("DB %s is too old", NickDBName); + fatal("DB %s is too old", Config.NickDBName); return; } @@ -349,7 +349,7 @@ void load_ns_dbase() while ((c = getc_db(f)) == 1) { if (c != 1) - fatal("Invalid format in %s", NickDBName); + fatal("Invalid format in %s", Config.NickDBName); SAFE(read_string(&s, f)); nc = new NickCore(s); @@ -370,7 +370,7 @@ void load_ns_dbase() //SAFE(read_int32(&nc->flags, f)); SAFE(read_int32(&tmp32, f)); - if (!NSAllowKillImmed) + if (!Config.NSAllowKillImmed) nc->UnsetFlag(NI_KILL_IMMED); SAFE(read_int16(&nc->language, f)); @@ -423,7 +423,7 @@ void load_ns_dbase() while ((c = getc_db(f)) == 1) { if (c != 1) - fatal("Invalid format in %s", NickDBName); + fatal("Invalid format in %s", Config.NickDBName); SAFE(read_string(&s, f)); na = new NickAlias(s, nclists[0]); // XXXXXXXX @@ -477,7 +477,7 @@ void load_ns_dbase() /* We check for coreless nicks (although it should never happen) */ if (!na->nc) { - alog("%s: while loading database: %s has no core! We delete it.", s_NickServ, na->nick); + alog("%s: while loading database: %s has no core! We delete it.", Config.s_NickServ, na->nick); delete na; continue; } @@ -493,9 +493,9 @@ void load_ns_dbase() #define SAFE(x) do { \ if ((x) < 0) { \ restore_db(f); \ - log_perror("Write error on %s", NickDBName); \ - if (time(NULL) - lastwarn > WarningTimeout) { \ - ircdproto->SendGlobops(NULL, "Write error on %s: %s", NickDBName, \ + log_perror("Write error on %s", Config.NickDBName); \ + if (time(NULL) - lastwarn > Config.WarningTimeout) { \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", Config.NickDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -513,7 +513,7 @@ void save_ns_dbase() NickCore *nc; static time_t lastwarn = 0; - if (!(f = open_db(s_NickServ, NickDBName, "w", NICK_VERSION))) + if (!(f = open_db(Config.s_NickServ, Config.NickDBName, "w", NICK_VERSION))) return; for (i = 0; i < 1024; i++) @@ -598,7 +598,7 @@ void save_ns_req_dbase() NickRequest *nr; static time_t lastwarn = 0; - if (!(f = open_db(s_NickServ, PreNickDBName, "w", PRE_NICK_VERSION))) + if (!(f = open_db(Config.s_NickServ, Config.PreNickDBName, "w", PRE_NICK_VERSION))) return; for (i = 0; i < 1024; i++) @@ -638,7 +638,7 @@ int validate_user(User * u) if ((nr = findrequestnick(u->nick))) { - notice_lang(s_NickServ, u, NICK_IS_PREREG); + notice_lang(Config.s_NickServ, u, NICK_IS_PREREG); } if (!(na = findnick(u->nick))) @@ -646,14 +646,14 @@ int validate_user(User * u) if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_NickServ, u, NICK_MAY_NOT_BE_USED); + notice_lang(Config.s_NickServ, u, NICK_MAY_NOT_BE_USED); collide(na, 0); return 0; } if (na->nc->HasFlag(NI_SUSPENDED)) { - notice_lang(s_NickServ, u, NICK_X_SUSPENDED, u->nick); + notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, u->nick); collide(na, 0); return 0; } @@ -674,26 +674,26 @@ int validate_user(User * u) if (u->IsRecognized() || !na->nc->HasFlag(NI_KILL_IMMED)) { if (na->nc->HasFlag(NI_SECURE)) - notice_lang(s_NickServ, u, NICK_IS_SECURE, s_NickServ); + notice_lang(Config.s_NickServ, u, NICK_IS_SECURE, Config.s_NickServ); else - notice_lang(s_NickServ, u, NICK_IS_REGISTERED, s_NickServ); + notice_lang(Config.s_NickServ, u, NICK_IS_REGISTERED, Config.s_NickServ); } if (na->nc->HasFlag(NI_KILLPROTECT) && !u->IsRecognized()) { if (na->nc->HasFlag(NI_KILL_IMMED)) { - notice_lang(s_NickServ, u, FORCENICKCHANGE_NOW); + notice_lang(Config.s_NickServ, u, FORCENICKCHANGE_NOW); collide(na, 0); } else if (na->nc->HasFlag(NI_KILL_QUICK)) { - notice_lang(s_NickServ, u, FORCENICKCHANGE_IN_20_SECONDS); + notice_lang(Config.s_NickServ, u, FORCENICKCHANGE_IN_20_SECONDS); t = new NickServCollide(na, 20); } else { - notice_lang(s_NickServ, u, FORCENICKCHANGE_IN_1_MINUTE); + notice_lang(Config.s_NickServ, u, FORCENICKCHANGE_IN_1_MINUTE); t = new NickServCollide(na, 60); } } @@ -723,13 +723,13 @@ void cancel_user(User * u) else if (ircd->svsnick) { uid = ts6_uid_retrieve(); - ircdproto->SendClientIntroduction(u->nick, NSEnforcerUser, NSEnforcerHost, "Services Enforcer", "+", uid.c_str()); - t = new NickServRelease(na, NSReleaseTimeout); + ircdproto->SendClientIntroduction(u->nick, Config.NSEnforcerUser, Config.NSEnforcerHost, "Services Enforcer", "+", uid.c_str()); + t = new NickServRelease(na, Config.NSReleaseTimeout); t->uid = uid; } else { - ircdproto->SendSVSKill(s_NickServ, u->nick, "Please do not use a registered nickname without identifying"); + ircdproto->SendSVSKill(Config.s_NickServ, u->nick, "Please do not use a registered nickname without identifying"); } na->SetFlag(NS_KILL_HELD); } @@ -784,7 +784,7 @@ void expire_nicks() continue; } - if (NSExpire && now - na->last_seen >= NSExpire + if (Config.NSExpire && now - na->last_seen >= Config.NSExpire && !na->HasFlag(NS_FORBIDDEN) && !na->HasFlag(NS_NO_EXPIRE) && !na->nc->HasFlag(NI_SUSPENDED)) { @@ -815,7 +815,7 @@ void expire_requests() for (nr = nrlists[i]; nr; nr = next) { next = nr->next; - if (NSRExpire && now - nr->requested >= NSRExpire) + if (Config.NSRExpire && now - nr->requested >= Config.NSRExpire) { alog("Request for nick %s expiring", nr->nick); delete nr; @@ -1087,7 +1087,7 @@ void change_core_display(NickCore * nc, const char *newdisplay) */ /* Log ... */ FOREACH_MOD(I_OnChangeCoreDisplay, OnChangeCoreDisplay(nc, newdisplay)); - alog("%s: changing %s nickname group display to %s", s_NickServ, + alog("%s: changing %s nickname group display to %s", Config.s_NickServ, nc->display, newdisplay); /* Remove the core from the list */ @@ -1135,7 +1135,7 @@ void collide(NickAlias * na, int from_timeout) * per second. So let use another safer method. * --lara */ - /* So you should check the length of NSGuestNickPrefix, eh Lara? + /* So you should check the length of Config.NSGUestNickPrefix, eh Lara? * --Certus */ @@ -1145,16 +1145,16 @@ void collide(NickAlias * na, int from_timeout) do { snprintf(guestnick, sizeof(guestnick), "%s%d", - NSGuestNickPrefix, getrandom16()); + Config.NSGuestNickPrefix, getrandom16()); } while (finduser(guestnick)); - notice_lang(s_NickServ, finduser(na->nick), FORCENICKCHANGE_CHANGING, guestnick); + notice_lang(Config.s_NickServ, finduser(na->nick), FORCENICKCHANGE_CHANGING, guestnick); ircdproto->SendForceNickChange(na->nick, guestnick, time(NULL)); na->SetFlag(NS_GUESTED); } else { - kill_user(s_NickServ, na->nick, "Services nickname-enforcer kill"); + kill_user(Config.s_NickServ, na->nick, "Services nickname-enforcer kill"); } } @@ -1193,7 +1193,7 @@ void del_ns_timeout(NickAlias * na, int type) */ void SetOperType(NickCore *nc) { - for (std::list<std::pair<std::string, std::string> >::iterator it = svsopers_in_config.begin(); it != svsopers_in_config.end(); ++it) + for (std::list<std::pair<std::string, std::string> >::iterator it = Config.Opers.begin(); it != Config.Opers.end(); ++it) { std::string nick = it->first; std::string type = it->second; @@ -1208,14 +1208,14 @@ void SetOperType(NickCore *nc) if (na->nc == nc) { - for (std::list<OperType *>::iterator tit = MyOperTypes.begin(); tit != MyOperTypes.end(); ++tit) + for (std::list<OperType *>::iterator tit = Config.MyOperTypes.begin(); tit != Config.MyOperTypes.end(); ++tit) { OperType *ot = *tit; if (ot->GetName() == type) { nc->ot = ot; - alog("%s: Tied oper %s to type %s", s_OperServ, nc->display, type.c_str()); + alog("%s: Tied oper %s to type %s", Config.s_OperServ, nc->display, type.c_str()); } } } diff --git a/src/operserv.c b/src/operserv.c index a875769cd..dc84d26b4 100644 --- a/src/operserv.c +++ b/src/operserv.c @@ -89,7 +89,7 @@ SListOpts szopts = { 0, NULL, &is_szline_entry_equal, &free_szline_entry }; /*************************************************************************/ /* *INDENT-OFF* */ void moduleAddOperServCmds() { - ModuleManager::LoadModuleList(OperServCoreModules); + ModuleManager::LoadModuleList(Config.OperServCoreModules); } /* *INDENT-ON* */ @@ -128,7 +128,7 @@ void operserv(User * u, char *buf) const char *cmd; const char *s; - alog("%s: %s: %s", s_OperServ, u->nick, buf); + alog("%s: %s: %s", Config.s_OperServ, u->nick, buf); cmd = strtok(buf, " "); if (!cmd) { @@ -137,9 +137,9 @@ void operserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - ircdproto->SendCTCP(findbot(s_OperServ), u->nick, "PING %s", s); + ircdproto->SendCTCP(findbot(Config.s_OperServ), u->nick, "PING %s", s); } else { - mod_run_cmd(s_OperServ, u, OPERSERV, cmd); + mod_run_cmd(Config.s_OperServ, u, OPERSERV, cmd); } } @@ -152,7 +152,7 @@ void operserv(User * u, char *buf) #define SAFE(x) do { \ if ((x) < 0) { \ if (!forceload) \ - fatal("Read error on %s", OperDBName); \ + fatal("Read error on %s", Config.OperDBName); \ failed = 1; \ break; \ } \ @@ -166,14 +166,14 @@ void load_os_dbase() uint32 tmp32; int failed = 0; - if (!(f = open_db(s_OperServ, OperDBName, "r", OPER_VERSION))) + if (!(f = open_db(Config.s_OperServ, Config.OperDBName, "r", OPER_VERSION))) return; ver = get_file_version(f); if (ver != 13) { close_db(f); - fatal("Read error on %s", ChanDBName); + fatal("Read error on %s", Config.ChanDBName); return; } @@ -267,9 +267,9 @@ void load_os_dbase() #define SAFE(x) do { \ if ((x) < 0) { \ restore_db(f); \ - log_perror("Write error on %s", OperDBName); \ - if (time(NULL) - lastwarn > WarningTimeout) { \ - ircdproto->SendGlobops(NULL, "Write error on %s: %s", OperDBName, \ + log_perror("Write error on %s", Config.OperDBName); \ + if (time(NULL) - lastwarn > Config.WarningTimeout) { \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", Config.OperDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -285,7 +285,7 @@ void save_os_dbase() Akill *ak; SXLine *sx; - if (!(f = open_db(s_OperServ, OperDBName, "w", OPER_VERSION))) + if (!(f = open_db(Config.s_OperServ, Config.OperDBName, "w", OPER_VERSION))) return; SAFE(write_int32(maxusercnt, f)); SAFE(write_int32(maxusertime, f)); @@ -356,7 +356,7 @@ Server *server_global(Server * s, char *msg) while (s) { /* Do not send the notice to ourselves our juped servers */ if (!s->HasFlag(SERVER_ISME) && !s->HasFlag(SERVER_JUPED)) - notice_server(s_GlobalNoticer, s, "%s", msg); + notice_server(Config.s_GlobalNoticer, s, "%s", msg); if (s->links) { sl = server_global(s->links, msg); @@ -383,7 +383,7 @@ void oper_global(char *nick, const char *fmt, ...) va_end(args); /* I don't like the way this is coded... */ - if ((nick) && (!AnonymousGlobal)) { + if ((nick) && (!Config.AnonymousGlobal)) { snprintf(dmsg, sizeof(dmsg), "[%s] %s", nick, msg); server_global(servlist, dmsg); } else { @@ -443,13 +443,13 @@ int add_akill(User * u, const char *mask, const char *by, const time_t expires, */ if (entry->expires >= expires || entry->expires == 0) { if (u) - notice_lang(s_OperServ, u, OPER_AKILL_EXISTS, + notice_lang(Config.s_OperServ, u, OPER_AKILL_EXISTS, mask); return -1; } else { entry->expires = expires; if (u) - notice_lang(s_OperServ, u, OPER_AKILL_CHANGED, + notice_lang(Config.s_OperServ, u, OPER_AKILL_CHANGED, amask); return -2; } @@ -458,7 +458,7 @@ int add_akill(User * u, const char *mask, const char *by, const time_t expires, if (Anope::Match(mask, amask, false) && (entry->expires >= expires || entry->expires == 0)) { if (u) - notice_lang(s_OperServ, u, OPER_AKILL_ALREADY_COVERED, + notice_lang(Config.s_OperServ, u, OPER_AKILL_ALREADY_COVERED, mask, amask); return -1; } @@ -475,7 +475,7 @@ int add_akill(User * u, const char *mask, const char *by, const time_t expires, /* We can now check whether the list is full or not. */ if (slist_full(&akills)) { if (u) - notice_lang(s_OperServ, u, OPER_AKILL_REACHED_LIMIT, + notice_lang(Config.s_OperServ, u, OPER_AKILL_REACHED_LIMIT, akills.limit); return -1; } @@ -509,7 +509,7 @@ int add_akill(User * u, const char *mask, const char *by, const time_t expires, slist_add(&akills, entry); - if (AkillOnAdd) + if (Config.AkillOnAdd) ircdproto->SendAkill(entry->user, entry->host, entry->by, entry->seton, entry->expires, entry->reason); @@ -579,8 +579,8 @@ void expire_akills() if (!ak->expires || ak->expires > now) continue; - if (WallAkillExpire) - ircdproto->SendGlobops(s_OperServ, "AKILL on %s@%s has expired", + if (Config.WallAkillExpire) + ircdproto->SendGlobops(Config.s_OperServ, "AKILL on %s@%s has expired", ak->user, ak->host); slist_delete(&akills, i); } @@ -659,13 +659,13 @@ int add_sgline(User * u, const char *mask, const char *by, time_t expires, if (!stricmp(entry->mask, mask)) { if (entry->expires >= expires || entry->expires == 0) { if (u) - notice_lang(s_OperServ, u, OPER_SGLINE_EXISTS, + notice_lang(Config.s_OperServ, u, OPER_SGLINE_EXISTS, mask); return -1; } else { entry->expires = expires; if (u) - notice_lang(s_OperServ, u, OPER_SGLINE_CHANGED, + notice_lang(Config.s_OperServ, u, OPER_SGLINE_CHANGED, entry->mask); return -2; } @@ -674,7 +674,7 @@ int add_sgline(User * u, const char *mask, const char *by, time_t expires, if (Anope::Match(mask, entry->mask, false ) && (entry->expires >= expires || entry->expires == 0)) { if (u) - notice_lang(s_OperServ, u, OPER_SGLINE_ALREADY_COVERED, + notice_lang(Config.s_OperServ, u, OPER_SGLINE_ALREADY_COVERED, mask, entry->mask); return -1; } @@ -691,7 +691,7 @@ int add_sgline(User * u, const char *mask, const char *by, time_t expires, /* We can now check whether the list is full or not. */ if (slist_full(&sglines)) { if (u) - notice_lang(s_OperServ, u, OPER_SGLINE_REACHED_LIMIT, + notice_lang(Config.s_OperServ, u, OPER_SGLINE_REACHED_LIMIT, sglines.limit); return -1; } @@ -711,14 +711,14 @@ int add_sgline(User * u, const char *mask, const char *by, time_t expires, ircdproto->SendSGLine(entry->mask, entry->reason); - if (KillonSGline && !ircd->sglineenforce) { + if (Config.KillonSGline && !ircd->sglineenforce) { snprintf(buf, (BUFSIZE - 1), "G-Lined: %s", entry->reason); u2 = firstuser(); while (u2) { next = nextuser(); if (!is_oper(u2)) { if (Anope::Match(u2->realname, entry->mask, false)) { - kill_user(ServerName, u2->nick, buf); + kill_user(Config.ServerName, u2->nick, buf); } } u2 = next; @@ -745,7 +745,7 @@ int check_sgline(const char *nick, const char *realname) if (Anope::Match(realname, sx->mask, false)) { ircdproto->SendSGLine(sx->mask, sx->reason); /* We kill nick since s_sgline can't */ - ircdproto->SendSVSKill(ServerName, nick, "G-Lined: %s", sx->reason); + ircdproto->SendSVSKill(Config.ServerName, nick, "G-Lined: %s", sx->reason); return 1; } } @@ -767,8 +767,8 @@ void expire_sglines() if (!sx->expires || sx->expires > now) continue; - if (WallSGLineExpire) - ircdproto->SendGlobops(s_OperServ, "SGLINE on \2%s\2 has expired", + if (Config.WallSGLineExpire) + ircdproto->SendGlobops(Config.s_OperServ, "SGLINE on \2%s\2 has expired", sx->mask); slist_delete(&sglines, i); } @@ -846,13 +846,13 @@ int add_sqline(User * u, const char *mask, const char *by, time_t expires, if (!stricmp(entry->mask, mask)) { if (entry->expires >= expires || entry->expires == 0) { if (u) - notice_lang(s_OperServ, u, OPER_SQLINE_EXISTS, + notice_lang(Config.s_OperServ, u, OPER_SQLINE_EXISTS, mask); return -1; } else { entry->expires = expires; if (u) - notice_lang(s_OperServ, u, OPER_SQLINE_CHANGED, + notice_lang(Config.s_OperServ, u, OPER_SQLINE_CHANGED, entry->mask); return -2; } @@ -861,7 +861,7 @@ int add_sqline(User * u, const char *mask, const char *by, time_t expires, if (Anope::Match(mask, entry->mask, false) && (entry->expires >= expires || entry->expires == 0)) { if (u) - notice_lang(s_OperServ, u, OPER_SQLINE_ALREADY_COVERED, + notice_lang(Config.s_OperServ, u, OPER_SQLINE_ALREADY_COVERED, mask, entry->mask); return -1; } @@ -878,7 +878,7 @@ int add_sqline(User * u, const char *mask, const char *by, time_t expires, /* We can now check whether the list is full or not. */ if (slist_full(&sqlines)) { if (u) - notice_lang(s_OperServ, u, OPER_SQLINE_REACHED_LIMIT, + notice_lang(Config.s_OperServ, u, OPER_SQLINE_REACHED_LIMIT, sqlines.limit); return -1; } @@ -898,14 +898,14 @@ int add_sqline(User * u, const char *mask, const char *by, time_t expires, sqline(entry->mask, entry->reason); - if (KillonSQline) { + if (Config.KillonSQline) { snprintf(buf, (BUFSIZE - 1), "Q-Lined: %s", entry->reason); u2 = firstuser(); while (u2) { next = nextuser(); if (!is_oper(u2)) { if (Anope::Match(u2->nick, entry->mask, false)) { - kill_user(ServerName, u2->nick, buf); + kill_user(Config.ServerName, u2->nick, buf); } } u2 = next; @@ -940,7 +940,7 @@ int check_sqline(const char *nick, int nick_change) sqline(sx->mask, sx->reason); /* We kill nick since s_sqline can't */ snprintf(reason, sizeof(reason), "Q-Lined: %s", sx->reason); - kill_user(s_OperServ, nick, reason); + kill_user(Config.s_OperServ, nick, reason); return 1; } } @@ -987,8 +987,8 @@ void expire_sqlines() if (!sx->expires || sx->expires > now) continue; - if (WallSQLineExpire) - ircdproto->SendGlobops(s_OperServ, "SQLINE on \2%s\2 has expired", + if (Config.WallSQLineExpire) + ircdproto->SendGlobops(Config.s_OperServ, "SQLINE on \2%s\2 has expired", sx->mask); slist_delete(&sqlines, i); @@ -1060,13 +1060,13 @@ int add_szline(User * u, const char *mask, const char *by, time_t expires, if (!stricmp(entry->mask, mask)) { if (entry->expires >= expires || entry->expires == 0) { if (u) - notice_lang(s_OperServ, u, OPER_SZLINE_EXISTS, + notice_lang(Config.s_OperServ, u, OPER_SZLINE_EXISTS, mask); return -1; } else { entry->expires = expires; if (u) - notice_lang(s_OperServ, u, OPER_SZLINE_EXISTS, + notice_lang(Config.s_OperServ, u, OPER_SZLINE_EXISTS, mask); return -2; } @@ -1074,7 +1074,7 @@ int add_szline(User * u, const char *mask, const char *by, time_t expires, if (Anope::Match(mask, entry->mask, false)) { if (u) - notice_lang(s_OperServ, u, OPER_SZLINE_ALREADY_COVERED, + notice_lang(Config.s_OperServ, u, OPER_SZLINE_ALREADY_COVERED, mask, entry->mask); return -1; } @@ -1090,7 +1090,7 @@ int add_szline(User * u, const char *mask, const char *by, time_t expires, /* We can now check whether the list is full or not. */ if (slist_full(&szlines)) { if (u) - notice_lang(s_OperServ, u, OPER_SZLINE_REACHED_LIMIT, + notice_lang(Config.s_OperServ, u, OPER_SZLINE_REACHED_LIMIT, szlines.limit); return -1; } @@ -1156,8 +1156,8 @@ void expire_szlines() if (!sx->expires || sx->expires > now) continue; - if (WallSZLineExpire) - ircdproto->SendGlobops(s_OperServ, "SZLINE on \2%s\2 has expired", + if (Config.WallSZLineExpire) + ircdproto->SendGlobops(Config.s_OperServ, "SZLINE on \2%s\2 has expired", sx->mask); slist_delete(&szlines, i); } @@ -1202,8 +1202,8 @@ static int is_szline_entry_equal(SList * slist, void *item1, void *item2) */ bool CheckDefCon(DefconLevel Level) { - if (DefConLevel) - return DefCon[DefConLevel][Level]; + if (Config.DefConLevel) + return DefCon[Config.DefConLevel][Level]; return false; } diff --git a/src/protocol.cpp b/src/protocol.cpp index 26fc18779..cf47bb61d 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -2,7 +2,7 @@ void IRCDProto::SendMessageInternal(BotInfo *bi, const char *dest, const char *buf) { - if (NSDefFlags.HasFlag(NI_MSG)) + if (Config.NSDefFlags.HasFlag(NI_MSG)) SendPrivmsgInternal(bi, dest, buf); else SendNoticeInternal(bi, dest, buf); @@ -40,7 +40,7 @@ void IRCDProto::SendGlobopsInternal(const char *source, const char *buf) if (bi) send_cmd(ircd->ts6 ? bi->uid : bi->nick, "GLOBOPS :%s", buf); else - send_cmd(ServerName, "GLOBOPS :%s", buf); + send_cmd(Config.ServerName, "GLOBOPS :%s", buf); } void IRCDProto::SendCTCPInternal(BotInfo *bi, const char *dest, const char *buf) @@ -170,9 +170,9 @@ void IRCDProto::SendQuit(BotInfo *bi, const char *fmt, ...) void IRCDProto::SendPong(const char *servname, const char *who) { if (!servname) - send_cmd(ircd->ts6 ? TS6SID : ServerName, "PONG %s", who); + send_cmd(ircd->ts6 ? TS6SID : Config.ServerName, "PONG %s", who); else - send_cmd(ircd->ts6 ? TS6SID : ServerName, "PONG %s %s", servname, who); + send_cmd(ircd->ts6 ? TS6SID : Config.ServerName, "PONG %s %s", servname, who); } void IRCDProto::SendInvite(BotInfo *bi, const char *chan, const char *nick) diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index b89bce40a..c14eb945f 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -173,7 +173,7 @@ class BahamutIRCdProto : public IRCDProto case 'o': if (add) { ++opcnt; - if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); + if (Config.WallOper) ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); } else --opcnt; break; @@ -196,13 +196,13 @@ class BahamutIRCdProto : public IRCDProto /* SVSHOLD - set */ void SendSVSHold(const char *nick) { - send_cmd(ServerName, "SVSHOLD %s %u :%s", nick, static_cast<unsigned>(NSReleaseTimeout), "Being held for registered user"); + send_cmd(Config.ServerName, "SVSHOLD %s %u :%s", nick, static_cast<unsigned>(Config.NSReleaseTimeout), "Being held for registered user"); } /* SVSHOLD - release */ void SendSVSHoldDel(const char *nick) { - send_cmd(ServerName, "SVSHOLD %s 0", nick); + send_cmd(Config.ServerName, "SVSHOLD %s 0", nick); } /* SVSMODE -b */ @@ -214,8 +214,8 @@ class BahamutIRCdProto : public IRCDProto /* SVSMODE channel modes */ void SendSVSModeChan(const char *name, const char *mode, const char *nick) { - if (nick) send_cmd(ServerName, "SVSMODE %s %s %s", name, mode, nick); - else send_cmd(ServerName, "SVSMODE %s %s", name, mode); + if (nick) send_cmd(Config.ServerName, "SVSMODE %s %s %s", name, mode, nick); + else send_cmd(Config.ServerName, "SVSMODE %s %s", name, mode); } void SendBotOp(const char *nick, const char *chan) @@ -330,7 +330,7 @@ class BahamutIRCdProto : public IRCDProto */ void SendSVSMode(User *u, int ac, const char **av) { - send_cmd(ServerName, "SVSMODE %s %ld %s", u->nick, static_cast<long>(u->timestamp), merge_args(ac, av)); + send_cmd(Config.ServerName, "SVSMODE %s %ld %s", u->nick, static_cast<long>(u->timestamp), merge_args(ac, av)); } void SendEOB() @@ -352,8 +352,8 @@ class BahamutIRCdProto : public IRCDProto void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes, const char *uid) { - EnforceQlinedNick(nick, s_BotServ); - send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real); + EnforceQlinedNick(nick, Config.s_BotServ); + send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, user, host, Config.ServerName, real); SendSQLine(nick, "Reserved for services"); } @@ -374,7 +374,7 @@ class BahamutIRCdProto : public IRCDProto { bahamut_cmd_pass(uplink_server->password); bahamut_cmd_capab(); - me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL); + me_server = new_server(NULL, Config.ServerName, Config.ServerDesc, SERVER_ISME, NULL); SendServer(me_server); bahamut_cmd_svinfo(); bahamut_cmd_burst(); @@ -464,7 +464,7 @@ int anope_event_os(const char *source, int ac, const char **av) { if (ac < 1) return MOD_CONT; - m_privmsg(source, s_OperServ, av[0]); + m_privmsg(source, Config.s_OperServ, av[0]); return MOD_CONT; } @@ -473,7 +473,7 @@ int anope_event_ns(const char *source, int ac, const char **av) { if (ac < 1) return MOD_CONT; - m_privmsg(source, s_NickServ, av[0]); + m_privmsg(source, Config.s_NickServ, av[0]); return MOD_CONT; } @@ -482,7 +482,7 @@ int anope_event_ms(const char *source, int ac, const char **av) { if (ac < 1) return MOD_CONT; - m_privmsg(source, s_MemoServ, av[0]); + m_privmsg(source, Config.s_MemoServ, av[0]); return MOD_CONT; } @@ -491,7 +491,7 @@ int anope_event_hs(const char *source, int ac, const char **av) { if (ac < 1) return MOD_CONT; - m_privmsg(source, s_HostServ, av[0]); + m_privmsg(source, Config.s_HostServ, av[0]); return MOD_CONT; } @@ -500,7 +500,7 @@ int anope_event_cs(const char *source, int ac, const char **av) { if (ac < 1) return MOD_CONT; - m_privmsg(source, s_ChanServ, av[0]); + m_privmsg(source, Config.s_ChanServ, av[0]); return MOD_CONT; } @@ -639,7 +639,7 @@ int anope_event_ping(const char *source, int ac, const char **av) { if (ac < 1) return MOD_CONT; - ircdproto->SendPong(ac > 1 ? av[1] : ServerName, av[0]); + ircdproto->SendPong(ac > 1 ? av[1] : Config.ServerName, av[0]); return MOD_CONT; } diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 9742a9c81..722d8668d 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -135,9 +135,9 @@ void inspircd_cmd_chghost(const char *nick, const char *vhost) if (!nick || !vhost) { return; } - send_cmd(s_OperServ, "CHGHOST %s %s", nick, vhost); + send_cmd(Config.s_OperServ, "CHGHOST %s %s", nick, vhost); } else { - ircdproto->SendGlobops(s_OperServ, "CHGHOST not loaded!"); + ircdproto->SendGlobops(Config.s_OperServ, "CHGHOST not loaded!"); } } @@ -183,7 +183,7 @@ class InspIRCdProto : public IRCDProto case 'o': if (add) { ++opcnt; - if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); + if (Config.WallOper) ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); } else --opcnt; break; @@ -216,7 +216,7 @@ class InspIRCdProto : public IRCDProto void SendAkillDel(const char *user, const char *host) { - send_cmd(s_OperServ, "GLINE %s@%s", user, host); + send_cmd(Config.s_OperServ, "GLINE %s@%s", user, host); } void SendTopic(BotInfo *whosets, const char *chan, const char *whosetit, const char *topic, time_t when) @@ -243,7 +243,7 @@ class InspIRCdProto : public IRCDProto time_t timeleft = expires - time(NULL); if (timeleft > 172800) timeleft = 172800; - send_cmd(ServerName, "ADDLINE G %s@%s %s %ld %ld :%s", user, host, who, static_cast<long>(time(NULL)), static_cast<long>(timeleft), reason); + send_cmd(Config.ServerName, "ADDLINE G %s@%s %s %ld %ld :%s", user, host, who, static_cast<long>(time(NULL)), static_cast<long>(timeleft), reason); } void SendSVSKillInternal(const char *source, const char *user, const char *buf) @@ -254,7 +254,7 @@ class InspIRCdProto : public IRCDProto void SendSVSMode(User *u, int ac, const char **av) { - send_cmd(s_NickServ, "MODE %s %s", u->nick, merge_args(ac, av)); + send_cmd(Config.s_NickServ, "MODE %s %s", u->nick, merge_args(ac, av)); } void SendNumericInternal(const char *source, int numeric, const char *dest, const char *buf) @@ -264,19 +264,19 @@ class InspIRCdProto : public IRCDProto void SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes) { - send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real); + send_cmd(Config.ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real); } void SendModeInternal(BotInfo *source, const char *dest, const char *buf) { if (!buf) return; Channel *c = findchan(dest); - send_cmd(source ? source->nick : s_OperServ, "FMODE %s %u %s", dest, static_cast<unsigned>(c ? c->creation_time : time(NULL)), buf); + send_cmd(source ? source->nick : Config.s_OperServ, "FMODE %s %u %s", dest, static_cast<unsigned>(c ? c->creation_time : time(NULL)), buf); } void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes, const char *uid) { - send_cmd(ServerName, "NICK %ld %s %s %s %s %s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real); + send_cmd(Config.ServerName, "NICK %ld %s %s %s %s %s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real); send_cmd(nick, "OPERTYPE Service"); } @@ -289,7 +289,7 @@ class InspIRCdProto : public IRCDProto void SendNoticeChanopsInternal(BotInfo *source, const char *dest, const char *buf) { if (!buf) return; - send_cmd(ServerName, "NOTICE @%s :%s", dest, buf); + send_cmd(Config.ServerName, "NOTICE @%s :%s", dest, buf); } void SendBotOp(const char *nick, const char *chan) @@ -301,7 +301,7 @@ class InspIRCdProto : public IRCDProto /* SERVER services-dev.chatspike.net password 0 :Description here */ void SendServer(Server *server) { - send_cmd(ServerName, "SERVER %s %s %d :%s", server->name, currentpass, server->hops, server->desc); + send_cmd(Config.ServerName, "SERVER %s %s %d :%s", server->name, currentpass, server->hops, server->desc); } /* JOIN */ @@ -314,21 +314,21 @@ class InspIRCdProto : public IRCDProto void SendSQLineDel(const char *user) { if (!user) return; - send_cmd(s_OperServ, "QLINE %s", user); + send_cmd(Config.s_OperServ, "QLINE %s", user); } /* SQLINE */ void SendSQLine(const char *mask, const char *reason) { if (!mask || !reason) return; - send_cmd(ServerName, "ADDLINE Q %s %s %ld 0 :%s", mask, s_OperServ, static_cast<long>(time(NULL)), reason); + send_cmd(Config.ServerName, "ADDLINE Q %s %s %ld 0 :%s", mask, Config.s_OperServ, static_cast<long>(time(NULL)), reason); } /* SQUIT */ void SendSquit(const char *servname, const char *message) { if (!servname || !message) return; - send_cmd(ServerName, "SQUIT %s :%s", servname, message); + send_cmd(Config.ServerName, "SQUIT %s :%s", servname, message); } /* Functions that use serval cmd functions */ @@ -343,10 +343,10 @@ class InspIRCdProto : public IRCDProto void SendConnect() { inspircd_cmd_pass(uplink_server->password); - me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL); + me_server = new_server(NULL, Config.ServerName, Config.ServerDesc, SERVER_ISME, NULL); SendServer(me_server); send_cmd(NULL, "BURST"); - send_cmd(ServerName, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, ServerName, ircd->name, version_flags, EncModuleList.begin()->c_str(), version_build); + send_cmd(Config.ServerName, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, Config.ServerName, ircd->name, version_flags, Config.EncModuleList.begin()->c_str(), version_build); } /* CHGIDENT */ @@ -356,34 +356,34 @@ class InspIRCdProto : public IRCDProto if (!nick || !vIdent || !*vIdent) { return; } - send_cmd(s_OperServ, "CHGIDENT %s %s", nick, vIdent); + send_cmd(Config.s_OperServ, "CHGIDENT %s %s", nick, vIdent); } else { - ircdproto->SendGlobops(s_OperServ, "CHGIDENT not loaded!"); + ircdproto->SendGlobops(Config.s_OperServ, "CHGIDENT not loaded!"); } } /* SVSHOLD - set */ void SendSVSHold(const char *nick) { - send_cmd(s_OperServ, "SVSHOLD %s %ds :%s", nick, static_cast<int>(NSReleaseTimeout), "Being held for registered user"); + send_cmd(Config.s_OperServ, "SVSHOLD %s %ds :%s", nick, static_cast<int>(Config.NSReleaseTimeout), "Being held for registered user"); } /* SVSHOLD - release */ void SendSVSHoldDel(const char *nick) { - send_cmd(s_OperServ, "SVSHOLD %s", nick); + send_cmd(Config.s_OperServ, "SVSHOLD %s", nick); } /* UNSZLINE */ void SendSZLineDel(const char *mask) { - send_cmd(s_OperServ, "ZLINE %s", mask); + send_cmd(Config.s_OperServ, "ZLINE %s", mask); } /* SZLINE */ void SendSZLine(const char *mask, const char *reason, const char *whom) { - send_cmd(ServerName, "ADDLINE Z %s %s %ld 0 :%s", mask, whom, static_cast<long>(time(NULL)), reason); + send_cmd(Config.ServerName, "ADDLINE Z %s %s %ld 0 :%s", mask, whom, static_cast<long>(time(NULL)), reason); } /* SVSMODE +- */ @@ -585,7 +585,7 @@ int anope_event_ping(const char *source, int ac, const char **av) { if (ac < 1) return MOD_CONT; - ircdproto->SendPong(ServerName, av[0]); + ircdproto->SendPong(Config.ServerName, av[0]); return MOD_CONT; } @@ -661,7 +661,7 @@ int anope_event_rsquit(const char *source, int ac, const char **av) return MOD_CONT; /* Horrible workaround to an insp bug (#) in how RSQUITs are sent - mark */ - if (ac > 1 && strcmp(ServerName, av[0]) == 0) + if (ac > 1 && strcmp(Config.ServerName, av[0]) == 0) do_squit(source, ac - 1, av + 1); else do_squit(source, ac, av); @@ -962,13 +962,13 @@ int anope_event_capab(const char *source, int ac, const char **av) return MOD_STOP; } if (!has_svsholdmod) { - ircdproto->SendGlobops(s_OperServ, "SVSHOLD missing, Usage disabled until module is loaded."); + ircdproto->SendGlobops(Config.s_OperServ, "SVSHOLD missing, Usage disabled until module is loaded."); } if (!has_chghostmod) { - ircdproto->SendGlobops(s_OperServ, "CHGHOST missing, Usage disabled until module is loaded."); + ircdproto->SendGlobops(Config.s_OperServ, "CHGHOST missing, Usage disabled until module is loaded."); } if (!has_chgidentmod) { - ircdproto->SendGlobops(s_OperServ, "CHGIDENT missing, Usage disabled until module is loaded."); + ircdproto->SendGlobops(Config.s_OperServ, "CHGIDENT missing, Usage disabled until module is loaded."); } if (has_messagefloodmod) { ModeManager::AddChannelMode('f', new ChannelModeFlood()); diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index b6df616eb..78216d1c8 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -136,11 +136,11 @@ void inspircd_cmd_chghost(const char *nick, const char *vhost) { if (has_chghostmod != 1) { - ircdproto->SendGlobops(s_OperServ, "CHGHOST not loaded!"); + ircdproto->SendGlobops(Config.s_OperServ, "CHGHOST not loaded!"); return; } - BotInfo *bi = findbot(s_OperServ); + BotInfo *bi = findbot(Config.s_OperServ); send_cmd(bi->uid, "CHGHOST %s %s", nick, vhost); } @@ -188,7 +188,7 @@ class InspIRCdProto : public IRCDProto case 'o': if (add) { ++opcnt; - if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); + if (Config.WallOper) ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); } else --opcnt; break; @@ -226,7 +226,7 @@ class InspIRCdProto : public IRCDProto void SendAkillDel(const char *user, const char *host) { - BotInfo *bi = findbot(s_OperServ); + BotInfo *bi = findbot(Config.s_OperServ); send_cmd(bi->uid, "GLINE %s@%s", user, host); } @@ -254,7 +254,7 @@ class InspIRCdProto : public IRCDProto time_t timeleft = expires - time(NULL); if (timeleft > 172800 || !expires) timeleft = 172800; - BotInfo *bi = findbot(s_OperServ); + BotInfo *bi = findbot(Config.s_OperServ); send_cmd(bi->uid, "ADDLINE G %s@%s %s %ld %ld :%s", user, host, who, static_cast<long>(time(NULL)), static_cast<long>(timeleft), reason); } @@ -267,7 +267,7 @@ class InspIRCdProto : public IRCDProto void SendSVSMode(User *u, int ac, const char **av) { - BotInfo *bi = findbot(s_NickServ); + BotInfo *bi = findbot(Config.s_NickServ); send_cmd(bi->uid, "MODE %s %s", u->GetUID().c_str(), merge_args(ac, av)); } @@ -332,7 +332,7 @@ class InspIRCdProto : public IRCDProto /* SQLINE */ void SendSQLine(const char *mask, const char *reason) { - send_cmd(TS6SID, "ADDLINE Q %s %s %ld 0 :%s", mask, s_OperServ, static_cast<long>(time(NULL)), reason); + send_cmd(TS6SID, "ADDLINE Q %s %s %ld 0 :%s", mask, Config.s_OperServ, static_cast<long>(time(NULL)), reason); } /* SQUIT */ @@ -353,10 +353,10 @@ class InspIRCdProto : public IRCDProto void SendConnect() { inspircd_cmd_pass(uplink_server->password); - me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, TS6SID); + me_server = new_server(NULL, Config.ServerName, Config.ServerDesc, SERVER_ISME, TS6SID); SendServer(me_server); send_cmd(TS6SID, "BURST"); - send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, ServerName, ircd->name, version_flags, EncModuleList.begin()->c_str(), version_build); + send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, Config.ServerName, ircd->name, version_flags, Config.EncModuleList.begin()->c_str(), version_build); } /* CHGIDENT */ @@ -364,11 +364,11 @@ class InspIRCdProto : public IRCDProto { if (has_chgidentmod == 0) { - ircdproto->SendGlobops(s_OperServ, "CHGIDENT not loaded!"); + ircdproto->SendGlobops(Config.s_OperServ, "CHGIDENT not loaded!"); } else { - BotInfo *bi = findbot(s_OperServ); + BotInfo *bi = findbot(Config.s_OperServ); send_cmd(bi->uid, "CHGIDENT %s %s", nick, vIdent); } } @@ -376,14 +376,14 @@ class InspIRCdProto : public IRCDProto /* SVSHOLD - set */ void SendSVSHold(const char *nick) { - BotInfo *bi = findbot(s_OperServ); - send_cmd(bi->uid, "SVSHOLD %s %u :%s", nick, static_cast<unsigned>(NSReleaseTimeout), "Being held for registered user"); + BotInfo *bi = findbot(Config.s_OperServ); + send_cmd(bi->uid, "SVSHOLD %s %u :%s", nick, static_cast<unsigned>(Config.NSReleaseTimeout), "Being held for registered user"); } /* SVSHOLD - release */ void SendSVSHoldDel(const char *nick) { - BotInfo *bi = findbot(s_OperServ); + BotInfo *bi = findbot(Config.s_OperServ); send_cmd(bi->uid, "SVSHOLD %s", nick); } @@ -1146,13 +1146,13 @@ int anope_event_capab(const char *source, int ac, const char **av) return MOD_STOP; } if (!has_svsholdmod) { - ircdproto->SendGlobops(s_OperServ, "SVSHOLD missing, Usage disabled until module is loaded."); + ircdproto->SendGlobops(Config.s_OperServ, "SVSHOLD missing, Usage disabled until module is loaded."); } if (!has_chghostmod) { - ircdproto->SendGlobops(s_OperServ, "CHGHOST missing, Usage disabled until module is loaded."); + ircdproto->SendGlobops(Config.s_OperServ, "CHGHOST missing, Usage disabled until module is loaded."); } if (!has_chgidentmod) { - ircdproto->SendGlobops(s_OperServ, "CHGIDENT missing, Usage disabled until module is loaded."); + ircdproto->SendGlobops(Config.s_OperServ, "CHGIDENT missing, Usage disabled until module is loaded."); } if (has_messagefloodmod) { ModeManager::AddChannelMode('f', new ChannelModeFlood()); @@ -1286,8 +1286,8 @@ class ProtoInspIRCd : public Module this->SetVersion("$Id$"); this->SetType(PROTOCOL); - if (Numeric) - TS6SID = sstrdup(Numeric); + if (Config.Numeric) + TS6SID = sstrdup(Config.Numeric); pmodule_ircd_version("InspIRCd 1.2"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 097f47f8d..1af8e3a4a 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -189,7 +189,7 @@ class RatboxProto : public IRCDTS6Proto case 'o': if (add) { ++opcnt; - if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); + if (Config.WallOper) ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); } else --opcnt; } @@ -217,20 +217,20 @@ class RatboxProto : public IRCDTS6Proto void SendSGLineDel(const char *mask) { - BotInfo *bi = findbot(s_OperServ); - send_cmd(bi ? bi->uid : s_OperServ, "UNXLINE * %s", mask); + BotInfo *bi = findbot(Config.s_OperServ); + send_cmd(bi ? bi->uid : Config.s_OperServ, "UNXLINE * %s", mask); } void SendSGLine(const char *mask, const char *reason) { - BotInfo *bi = findbot(s_OperServ); - send_cmd(bi ? bi->uid : s_OperServ, "XLINE * %s 0 :%s", mask, reason); + BotInfo *bi = findbot(Config.s_OperServ); + send_cmd(bi ? bi->uid : Config.s_OperServ, "XLINE * %s 0 :%s", mask, reason); } void SendAkillDel(const char *user, const char *host) { - BotInfo *bi = findbot(s_OperServ); - send_cmd(bi ? bi->uid : s_OperServ, "UNKLINE * %s %s", user, host); + BotInfo *bi = findbot(Config.s_OperServ); + send_cmd(bi ? bi->uid : Config.s_OperServ, "UNKLINE * %s %s", user, host); } void SendSQLineDel(const char *user) @@ -254,8 +254,8 @@ class RatboxProto : public IRCDTS6Proto void SendAkill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason) { - BotInfo *bi = findbot(s_OperServ); - send_cmd(bi ? bi->uid : s_OperServ, "KLINE * %ld %s %s :%s", static_cast<long>(expires - time(NULL)), user, host, reason); + BotInfo *bi = findbot(Config.s_OperServ); + send_cmd(bi ? bi->uid : Config.s_OperServ, "KLINE * %ld %s %s :%s", static_cast<long>(expires - time(NULL)), user, host, reason); } void SendSVSKillInternal(const char *source, const char *user, const char *buf) @@ -281,7 +281,7 @@ class RatboxProto : public IRCDTS6Proto ratbox_cmd_pass(uplink_server->password); ratbox_cmd_capab(); /* Make myself known to myself in the serverlist */ - me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, TS6SID); + me_server = new_server(NULL, Config.ServerName, Config.ServerDesc, SERVER_ISME, TS6SID); SendServer(me_server); ratbox_cmd_svinfo(); } @@ -562,7 +562,7 @@ int anope_event_ping(const char *source, int ac, const char **av) { if (ac < 1) return MOD_CONT; - ircdproto->SendPong(ac > 1 ? av[1] : ServerName, av[0]); + ircdproto->SendPong(ac > 1 ? av[1] : Config.ServerName, av[0]); return MOD_CONT; } @@ -888,8 +888,8 @@ class ProtoRatbox : public Module this->SetVersion("$Id$"); this->SetType(PROTOCOL); - if (Numeric) - TS6SID = sstrdup(Numeric); + if (Config.Numeric) + TS6SID = sstrdup(Config.Numeric); UseTSMODE = 1; /* TMODE */ pmodule_ircd_version("Ratbox IRCD 2.0+"); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 9e46ea6e4..b4a86525c 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -127,12 +127,12 @@ void unreal_cmd_netinfo(int ac, const char **av) TKLEXT = Extended TKL we don't use it but best to have it SJB64 = Base64 encoded time stamps VL = Version Info - NS = Numeric Server + NS = Config.Numeric Server */ void unreal_cmd_capab() { - if (Numeric) + if (Config.Numeric) { send_cmd(NULL, "PROTOCTL NICKv2 VHP UMODE2 NICKIP TOKEN SJOIN SJOIN2 SJ3 NOQUIT TKLEXT SJB64 VL"); } @@ -154,7 +154,7 @@ void unreal_cmd_chghost(const char *nick, const char *vhost) if (!nick || !vhost) { return; } - send_cmd(ServerName, "AL %s %s", nick, vhost); + send_cmd(Config.ServerName, "AL %s %s", nick, vhost); } /* CHGIDENT */ @@ -163,7 +163,7 @@ void unreal_cmd_chgident(const char *nick, const char *vIdent) if (!nick || !vIdent) { return; } - send_cmd(ServerName, "AZ %s %s", nick, vIdent); + send_cmd(Config.ServerName, "AZ %s %s", nick, vIdent); } @@ -207,7 +207,7 @@ class UnrealIRCdProto : public IRCDProto case 'o': if (add) { ++opcnt; - if (WallOper) ircdproto->SendGlobops(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); + if (Config.WallOper) ircdproto->SendGlobops(Config.s_OperServ, "\2%s\2 is now an IRC operator.", user->nick); } else --opcnt; break; @@ -257,7 +257,7 @@ class UnrealIRCdProto : public IRCDProto void SendAkillDel(const char *user, const char *host) { - send_cmd(NULL, "BD - G %s %s %s", user, host, s_OperServ); + send_cmd(NULL, "BD - G %s %s %s", user, host, Config.s_OperServ); } void SendTopic(BotInfo *whosets, const char *chan, const char *whosetit, const char *topic, time_t when) @@ -302,7 +302,7 @@ class UnrealIRCdProto : public IRCDProto { if (ac >= 1) { if (!u || !av[0]) return; - send_cmd(ServerName, "v %s %s", u->nick, merge_args(ac, av)); + send_cmd(Config.ServerName, "v %s %s", u->nick, merge_args(ac, av)); } } @@ -314,8 +314,8 @@ class UnrealIRCdProto : public IRCDProto void SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes, const char *uid) { - EnforceQlinedNick(nick, s_BotServ); - send_cmd(NULL, "& %s 1 %ld %s %s %s 0 %s %s%s :%s", nick, static_cast<long>(time(NULL)), user, host, ServerName, modes, host, + EnforceQlinedNick(nick, Config.s_BotServ); + send_cmd(NULL, "& %s 1 %ld %s %s %s 0 %s %s%s :%s", nick, static_cast<long>(time(NULL)), user, host, Config.ServerName, modes, host, myIrcd->nickip ? " *" : " ", real); SendSQLine(nick, "Reserved for services"); } @@ -341,8 +341,8 @@ class UnrealIRCdProto : public IRCDProto /* Unreal 3.2 actually sends some info about itself in the descript area */ void SendServer(Server *server) { - if (Numeric) - send_cmd(NULL, "SERVER %s %d :U0-*-%s %s", server->name, server->hops, Numeric, server->desc); + if (Config.Numeric) + send_cmd(NULL, "SERVER %s %d :U0-*-%s %s", server->name, server->hops, Config.Numeric, server->desc); else send_cmd(NULL, "SERVER %s %d :%s", server->name, server->hops, server->desc); } @@ -350,7 +350,7 @@ class UnrealIRCdProto : public IRCDProto /* JOIN */ void SendJoin(BotInfo *user, const char *channel, time_t chantime) { - send_cmd(ServerName, "~ !%s %s :%s", base64enc(static_cast<long>(chantime)), channel, user->nick); + send_cmd(Config.ServerName, "~ !%s %s :%s", base64enc(static_cast<long>(chantime)), channel, user->nick); } /* unsqline @@ -411,24 +411,24 @@ class UnrealIRCdProto : public IRCDProto { unreal_cmd_capab(); unreal_cmd_pass(uplink_server->password); - if (Numeric) - me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, Numeric); + if (Config.Numeric) + me_server = new_server(NULL, Config.ServerName, Config.ServerDesc, SERVER_ISME, Config.Numeric); else - me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL); + me_server = new_server(NULL, Config.ServerName, Config.ServerDesc, SERVER_ISME, NULL); SendServer(me_server); } /* SVSHOLD - set */ void SendSVSHold(const char *nick) { - send_cmd(NULL, "BD + Q H %s %s %ld %ld :%s", nick, ServerName, static_cast<long>(time(NULL) + NSReleaseTimeout), + send_cmd(NULL, "BD + Q H %s %s %ld %ld :%s", nick, Config.ServerName, static_cast<long>(time(NULL) + Config.NSReleaseTimeout), static_cast<long>(time(NULL)), "Being held for registered user"); } /* SVSHOLD - release */ void SendSVSHoldDel(const char *nick) { - send_cmd(NULL, "BD - Q * %s %s", nick, ServerName); + send_cmd(NULL, "BD - Q * %s %s", nick, Config.ServerName); } /* UNSGLINE */ @@ -443,7 +443,7 @@ class UnrealIRCdProto : public IRCDProto /* UNSZLINE */ void SendSZLineDel(const char *mask) { - send_cmd(NULL, "BD - Z * %s %s", mask, s_OperServ); + send_cmd(NULL, "BD - Z * %s %s", mask, Config.s_OperServ); } /* SZLINE */ @@ -475,8 +475,8 @@ class UnrealIRCdProto : public IRCDProto void SendSVSModeChan(const char *name, const char *mode, const char *nick) { - if (nick) send_cmd(ServerName, "n %s %s %s", name, mode, nick); - else send_cmd(ServerName, "n %s %s", name, mode); + if (nick) send_cmd(Config.ServerName, "n %s %s %s", name, mode, nick); + else send_cmd(Config.ServerName, "n %s %s", name, mode); } /* svsjoin @@ -511,7 +511,7 @@ class UnrealIRCdProto : public IRCDProto void SendEOB() { - send_cmd(ServerName, "ES"); + send_cmd(Config.ServerName, "ES"); } /* @@ -568,7 +568,7 @@ int anope_event_ping(const char *source, int ac, const char **av) { if (ac < 1) return MOD_CONT; - ircdproto->SendPong(ac > 1 ? av[1] : ServerName, av[0]); + ircdproto->SendPong(ac > 1 ? av[1] : Config.ServerName, av[0]); return MOD_CONT; } diff --git a/src/regchannel.cpp b/src/regchannel.cpp index d4b37f4e9..993000b38 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -44,16 +44,16 @@ ChannelInfo::ChannelInfo(const std::string &chname) size_t t; /* Set default channel flags */ for (t = CI_BEGIN + 1; t != CI_END; ++t) - if (CSDefFlags.HasFlag(static_cast<ChannelInfoFlag>(t))) + if (Config.CSDefFlags.HasFlag(static_cast<ChannelInfoFlag>(t))) this->SetFlag(static_cast<ChannelInfoFlag>(t)); /* Set default bot flags */ for (t = BI_BEGIN + 1; t != BI_END; ++t) - if (BSDefFlags.HasFlag(static_cast<BotServFlag>(t))) + if (Config.BSDefFlags.HasFlag(static_cast<BotServFlag>(t))) this->botflags.SetFlag(static_cast<BotServFlag>(t)); - bantype = CSDefBantype; - memos.memomax = MSMaxMemos; + bantype = Config.CSDefBantype; + memos.memomax = Config.MSMaxMemos; last_used = time_registered = time(NULL); this->ttb = new int16[2 * TTB_SIZE]; @@ -86,7 +86,7 @@ ChannelInfo::~ChannelInfo() if (this->c) { - if (this->bi && this->c->usercount >= BSMinUsers) + if (this->bi && this->c->usercount >= Config.BSMinUsers) ircdproto->SendPart(this->bi, this->c->name, NULL); this->c->ci = NULL; } diff --git a/src/send.c b/src/send.c index 6ac67f748..d40110072 100644 --- a/src/send.c +++ b/src/send.c @@ -98,7 +98,7 @@ void notice_server(char *source, Server * s, const char *fmt, ...) va_start(args, fmt); vsnprintf(buf, BUFSIZE - 1, fmt, args); - if (NSDefFlags.HasFlag(NI_MSG)) { + if (Config.NSDefFlags.HasFlag(NI_MSG)) { ircdproto->SendGlobalPrivmsg(findbot(source), s->name, buf); } else { ircdproto->SendGlobalNotice(findbot(source), s->name, buf); diff --git a/src/servers.c b/src/servers.c index 4af9c62bc..8b1dee85e 100644 --- a/src/servers.c +++ b/src/servers.c @@ -168,7 +168,7 @@ Server *new_server(Server * server_uplink, const char *name, const char *desc, /* And hybrid needs Global joined in the logchan */ if (LogChan && ircd->join2msg) { /* XXX might desync */ - ircdproto->SendJoin(findbot(s_GlobalNoticer), LogChannel, time(NULL)); + ircdproto->SendJoin(findbot(Config.s_GlobalNoticer), Config.LogChannel, time(NULL)); } } serv_uplink = serv; @@ -227,7 +227,7 @@ static void delete_server(Server * serv, const char *quitreason) (quitreason ? sstrdup(quitreason) : NULL); } - if (LimitSessions && !is_ulined(u->server->name)) { + if (Config.LimitSessions && !is_ulined(u->server->name)) { del_session(u->host); } delete u; @@ -416,8 +416,8 @@ void do_server(const char *source, const char *servername, const char *hops, newserver = new_server(s, servername, descript, SERVER_START, numeric); /* Announce services being online. */ - if (GlobalOnCycle && GlobalOnCycleUP) - notice_server(s_GlobalNoticer, newserver, "%s", GlobalOnCycleUP); + if (Config.GlobalOnCycle && Config.GlobalOnCycleUP) + notice_server(Config.s_GlobalNoticer, newserver, "%s", Config.GlobalOnCycleUP); /* Let modules know about the connection */ FOREACH_MOD(I_OnNewServer, OnNewServer(newserver)); @@ -458,7 +458,7 @@ void do_squit(const char *source, int ac, const char **av) { snprintf(buf, BUFSIZE, "Received SQUIT for juped server %s", s->name); - ircdproto->SendGlobops(s_OperServ, buf); + ircdproto->SendGlobops(Config.s_OperServ, buf); } snprintf(buf, sizeof(buf), "%s %s", s->name, @@ -533,8 +533,8 @@ int is_ulined(const char *server) { int j; - for (j = 0; j < NumUlines; j++) { - if (stricmp(Ulines[j], server) == 0) { + for (j = 0; j < Config.NumUlines; j++) { + if (stricmp(Config.Ulines[j], server) == 0) { return 1; } } diff --git a/src/sessions.c b/src/sessions.c index 014b9da01..1372ba1a0 100644 --- a/src/sessions.c +++ b/src/sessions.c @@ -138,13 +138,13 @@ int add_session(const char *nick, const char *host, char *hostip) if (session) { exception = find_hostip_exception(host, hostip); - sessionlimit = exception ? exception->limit : DefSessionLimit; + sessionlimit = exception ? exception->limit : Config.DefSessionLimit; if (sessionlimit != 0 && session->count >= sessionlimit) { - if (SessionLimitExceeded) - ircdproto->SendMessage(findbot(s_OperServ), nick, SessionLimitExceeded, host); - if (SessionLimitDetailsLoc) - ircdproto->SendMessage(findbot(s_OperServ), nick, "%s", SessionLimitDetailsLoc); + if (Config.SessionLimitExceeded) + ircdproto->SendMessage(findbot(Config.s_OperServ), nick, Config.SessionLimitExceeded, host); + if (Config.SessionLimitDetailsLoc) + ircdproto->SendMessage(findbot(Config.s_OperServ), nick, "%s", Config.SessionLimitDetailsLoc); /* Previously on IRCds that send a QUIT (InspIRCD) when a user is killed, the session for a host was * decremented in do_quit, which caused problems and fixed here @@ -154,16 +154,16 @@ int add_session(const char *nick, const char *host, char *hostip) * decremented in do_kill or in do_quit - Adam */ session->count++; - kill_user(s_OperServ, nick, "Session limit exceeded"); + kill_user(Config.s_OperServ, nick, "Session limit exceeded"); session->hits++; - if (MaxSessionKill && session->hits >= MaxSessionKill) { + if (Config.MaxSessionKill && session->hits >= Config.MaxSessionKill) { char akillmask[BUFSIZE]; snprintf(akillmask, sizeof(akillmask), "*@%s", host); - add_akill(NULL, akillmask, s_OperServ, - time(NULL) + SessionAutoKillExpiry, + add_akill(NULL, akillmask, Config.s_OperServ, + time(NULL) + Config.SessionAutoKillExpiry, "Session limit exceeded"); - ircdproto->SendGlobops(s_OperServ, + ircdproto->SendGlobops(Config.s_OperServ, "Added a temporary AKILL for \2%s\2 due to excessive connections", akillmask); } @@ -193,7 +193,7 @@ void del_session(const char *host) { Session *session; - if (!LimitSessions) { + if (!Config.LimitSessions) { if (debug) { alog("debug: del_session called when LimitSessions is disabled"); } @@ -214,7 +214,7 @@ void del_session(const char *host) if (!session) { if (debug) { - ircdproto->SendGlobops(s_OperServ, + ircdproto->SendGlobops(Config.s_OperServ, "WARNING: Tried to delete non-existant session: \2%s", host); alog("session: Tried to delete non-existant session: %s", @@ -260,8 +260,8 @@ void expire_exceptions() for (i = 0; i < nexceptions; i++) { if (exceptions[i].expires == 0 || exceptions[i].expires > now) continue; - if (WallExceptionExpire) - ircdproto->SendGlobops(s_OperServ, + if (Config.WallExceptionExpire) + ircdproto->SendGlobops(Config.s_OperServ, "Session limit exception for %s has expired.", exceptions[i].mask); delete [] exceptions[i].mask; @@ -312,7 +312,7 @@ Exception *find_hostip_exception(const char *host, const char *hostip) #define SAFE(x) do { \ if ((x) < 0) { \ if (!forceload) \ - fatal("Read error on %s", ExceptionDBName); \ + fatal("Read error on %s", Config.ExceptionDBName); \ nexceptions = i; \ break; \ } \ @@ -327,7 +327,7 @@ void load_exceptions() uint32 tmp32; if (! - (f = open_db(s_OperServ, ExceptionDBName, "r", EXCEPTION_VERSION))) + (f = open_db(Config.s_OperServ, Config.ExceptionDBName, "r", EXCEPTION_VERSION))) return; switch (i = get_file_version(f)) { case 9: @@ -354,7 +354,7 @@ void load_exceptions() break; default: - fatal("Unsupported version (%d) on %s", i, ExceptionDBName); + fatal("Unsupported version (%d) on %s", i, Config.ExceptionDBName); } /* switch (ver) */ close_db(f); @@ -367,9 +367,9 @@ void load_exceptions() #define SAFE(x) do { \ if ((x) < 0) { \ restore_db(f); \ - log_perror("Write error on %s", ExceptionDBName); \ - if (time(NULL) - lastwarn > WarningTimeout) { \ - ircdproto->SendGlobops(NULL, "Write error on %s: %s", ExceptionDBName, \ + log_perror("Write error on %s", Config.ExceptionDBName); \ + if (time(NULL) - lastwarn > Config.WarningTimeout) { \ + ircdproto->SendGlobops(NULL, "Write error on %s: %s", Config.ExceptionDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -384,7 +384,7 @@ void save_exceptions() static time_t lastwarn = 0; if (! - (f = open_db(s_OperServ, ExceptionDBName, "w", EXCEPTION_VERSION))) + (f = open_db(Config.s_OperServ, Config.ExceptionDBName, "w", EXCEPTION_VERSION))) return; SAFE(write_int16(nexceptions, f)); for (i = 0; i < nexceptions; i++) { @@ -416,12 +416,12 @@ int exception_add(User * u, const char *mask, const int limit, if (exceptions[i].limit != limit) { exceptions[i].limit = limit; if (u) - notice_lang(s_OperServ, u, OPER_EXCEPTION_CHANGED, + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_CHANGED, mask, exceptions[i].limit); return -2; } else { if (u) - notice_lang(s_OperServ, u, OPER_EXCEPTION_EXISTS, + notice_lang(Config.s_OperServ, u, OPER_EXCEPTION_EXISTS, mask); return -1; } diff --git a/src/sockutil.c b/src/sockutil.c index 6690c4f53..39e397dc1 100644 --- a/src/sockutil.c +++ b/src/sockutil.c @@ -421,7 +421,7 @@ char *sgets(char *buf, int len, ano_socket_t s) return NULL; FD_ZERO(&fds); FD_SET(s, &fds); - tv.tv_sec = ReadTimeout; + tv.tv_sec = Config.ReadTimeout; tv.tv_usec = 0; while (read_buffer_len() == 0 && (c = select(s + 1, &fds, NULL, NULL, &tv)) < 0) { @@ -547,8 +547,8 @@ static char *pack_ip(const char *ipaddr) * given (lhost==NULL, lport==0), then they are left free to vary. * @param host Remote Host * @param port Remote Port - * @param lhost LocalHost - * @param lport LocalPort + * @param lhost Config.LocalHost + * @param lport Config.LocalPort * @return int if successful */ int conn(const char *host, int port, const char *lhost, int lport) diff --git a/src/users.c b/src/users.c index 5ca1aac03..4409a221d 100644 --- a/src/users.c +++ b/src/users.c @@ -64,7 +64,7 @@ User::User(const std::string &snick, const std::string &suid) { maxusercnt = usercnt; maxusertime = time(NULL); - if (LogMaxUsers) + if (Config.LogMaxUsers) alog("user: New maximum user count: %d", maxusercnt); } @@ -226,7 +226,7 @@ User::~User() struct u_chanlist *c, *c2; char *srealname; - if (LogUsers) + if (Config.LogUsers) { srealname = normalizeBuffer(this->realname); @@ -324,8 +324,8 @@ void User::SendMessage(const char *source, const std::string &msg) * - The user is not registered and NSDefMsg is enabled * - The user is registered and has set /ns set msg on */ - if (UsePrivmsg && - ((!this->nc && NSDefFlags.HasFlag(NI_MSG)) || (this->nc && this->nc->HasFlag(NI_MSG)))) + if (Config.UsePrivmsg && + ((!this->nc && Config.NSDefFlags.HasFlag(NI_MSG)) || (this->nc && this->nc->HasFlag(NI_MSG)))) { ircdproto->SendPrivmsg(findbot(source), this->nick, "%s", msg.c_str()); } @@ -638,7 +638,7 @@ User *do_nick(const char *source, const char *nick, const char *username, const } - if (LogUsers) { + if (Config.LogUsers) { /** * Ugly swap routine for Flop's bug :) **/ @@ -706,7 +706,7 @@ User *do_nick(const char *source, const char *nick, const char *username, const if (ircd->szline && ircd->nickip) check_szline(nick, ipbuf); - if (LimitSessions && !is_ulined(server)) + if (Config.LimitSessions && !is_ulined(server)) add_session(nick, host, ipbuf); /* Only call I_OnUserConnect if the user still exists */ @@ -730,7 +730,7 @@ User *do_nick(const char *source, const char *nick, const char *username, const if (debug) alog("debug: %s changes nick to %s", source, nick); - if (LogUsers) { + if (Config.LogUsers) { logrealname = normalizeBuffer(user->realname); if (ircd->vhost) { alog("LOGUSERS: %s (%s@%s => %s) (%s) changed nick to %s (%s).", user->nick, user->GetIdent().c_str(), user->host, user->GetDisplayedHost().c_str(), logrealname, nick, user->server->name); @@ -820,7 +820,7 @@ User *do_nick(const char *source, const char *nick, const char *username, const std::string last_usermask = user->GetIdent() + "@" + user->GetDisplayedHost(); ntmp->last_usermask = sstrdup(last_usermask.c_str()); ircdproto->SetAutoIdentificationToken(user); - alog("%s: %s!%s@%s automatically identified for nick %s", s_NickServ, user->nick, user->GetIdent().c_str(), user->host, user->nick); + alog("%s: %s!%s@%s automatically identified for nick %s", Config.s_NickServ, user->nick, user->GetIdent().c_str(), user->host, user->nick); } /* Bahamut sets -r on every nick changes, so we must test it even if nc_changed == 0 */ @@ -884,7 +884,7 @@ void do_quit(const char *source, int ac, const char **av) delete [] na->last_quit; na->last_quit = *av[0] ? sstrdup(av[0]) : NULL; } - if (LimitSessions && !is_ulined(user->server->name)) { + if (Config.LimitSessions && !is_ulined(user->server->name)) { del_session(user->host); } FOREACH_MOD(I_OnUserQuit, OnUserQuit(user, *av[0] ? av[0] : "")); @@ -920,7 +920,7 @@ void do_kill(const char *nick, const char *msg) na->last_quit = *msg ? sstrdup(msg) : NULL; } - if (LimitSessions && !is_ulined(user->server->name)) { + if (Config.LimitSessions && !is_ulined(user->server->name)) { del_session(user->host); } delete user; |