diff options
50 files changed, 41 insertions, 81 deletions
diff --git a/include/module.h b/include/module.h index 6ff54a31f..d2b365bd7 100644 --- a/include/module.h +++ b/include/module.h @@ -46,9 +46,9 @@ #include "users.h" #include "xline.h" -#include "chanserv.h" -#include "global.h" -#include "memoserv.h" -#include "nickserv.h" +#include "modules/chanserv.h" +#include "modules/global.h" +#include "modules/memoserv.h" +#include "modules/nickserv.h" #endif // MODULE_H diff --git a/modules/pseudoclients/chanserv.h b/include/modules/chanserv.h index e1c3849fd..e1c3849fd 100644 --- a/modules/pseudoclients/chanserv.h +++ b/include/modules/chanserv.h diff --git a/modules/dns.h b/include/modules/dns.h index 99b84098f..99b84098f 100644 --- a/modules/dns.h +++ b/include/modules/dns.h diff --git a/modules/pseudoclients/global.h b/include/modules/global.h index 52afc4a23..52afc4a23 100644 --- a/modules/pseudoclients/global.h +++ b/include/modules/global.h diff --git a/modules/httpd.h b/include/modules/httpd.h index 6127a51e0..6127a51e0 100644 --- a/modules/httpd.h +++ b/include/modules/httpd.h diff --git a/modules/ldapapi.h b/include/modules/ldap.h index 65be27687..65be27687 100644 --- a/modules/ldapapi.h +++ b/include/modules/ldap.h diff --git a/modules/pseudoclients/memoserv.h b/include/modules/memoserv.h index d35d3f8a0..d35d3f8a0 100644 --- a/modules/pseudoclients/memoserv.h +++ b/include/modules/memoserv.h diff --git a/modules/pseudoclients/nickserv.h b/include/modules/nickserv.h index b20d6ebd1..b20d6ebd1 100644 --- a/modules/pseudoclients/nickserv.h +++ b/include/modules/nickserv.h diff --git a/modules/commands/os_forbid.h b/include/modules/os_forbid.h index 3f1fe9a7f..3f1fe9a7f 100644 --- a/modules/commands/os_forbid.h +++ b/include/modules/os_forbid.h diff --git a/modules/commands/os_ignore.h b/include/modules/os_ignore.h index 6c3e237ab..6c3e237ab 100644 --- a/modules/commands/os_ignore.h +++ b/include/modules/os_ignore.h diff --git a/modules/commands/os_news.h b/include/modules/os_news.h index b1e717455..b1e717455 100644 --- a/modules/commands/os_news.h +++ b/include/modules/os_news.h diff --git a/modules/commands/os_session.h b/include/modules/os_session.h index f3077d0ac..f3077d0ac 100644 --- a/modules/commands/os_session.h +++ b/include/modules/os_session.h diff --git a/modules/sql.h b/include/modules/sql.h index 1c8fdd3aa..1c8fdd3aa 100644 --- a/modules/sql.h +++ b/include/modules/sql.h diff --git a/modules/ssl.h b/include/modules/ssl.h index 6eb97582c..6eb97582c 100644 --- a/modules/ssl.h +++ b/include/modules/ssl.h diff --git a/modules/xmlrpc.h b/include/modules/xmlrpc.h index d5a5ea4a7..d5a5ea4a7 100644 --- a/modules/xmlrpc.h +++ b/include/modules/xmlrpc.h diff --git a/modules/commands/cs_fantasy_stats.cpp b/modules/commands/cs_fantasy_stats.cpp index 7709a38d3..381063c34 100644 --- a/modules/commands/cs_fantasy_stats.cpp +++ b/modules/commands/cs_fantasy_stats.cpp @@ -12,7 +12,7 @@ /*************************************************************************/ #include "module.h" -#include "sql.h" +#include "modules/sql.h" class MySQLInterface : public SQL::Interface { diff --git a/modules/commands/cs_fantasy_top.cpp b/modules/commands/cs_fantasy_top.cpp index ef87cd87f..a3e35eb3c 100644 --- a/modules/commands/cs_fantasy_top.cpp +++ b/modules/commands/cs_fantasy_top.cpp @@ -12,7 +12,7 @@ /*************************************************************************/ #include "module.h" -#include "sql.h" +#include "modules/sql.h" class MySQLInterface : public SQL::Interface { diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp index 7e817caa9..b3ad62859 100644 --- a/modules/commands/cs_log.cpp +++ b/modules/commands/cs_log.cpp @@ -12,7 +12,6 @@ /*************************************************************************/ #include "module.h" -#include "memoserv.h" class CommandCSLog : public Command { diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp index 5d0fe9f21..1e1cd0646 100644 --- a/modules/commands/cs_xop.cpp +++ b/modules/commands/cs_xop.cpp @@ -13,7 +13,6 @@ namespace { - ServiceReference<ChanServService> chanserv("ChanServService", "ChanServ"); std::vector<Anope::string> order; std::map<Anope::string, std::vector<Anope::string> > permissions; } diff --git a/modules/commands/gl_global.cpp b/modules/commands/gl_global.cpp index fae4554d4..70dd4d324 100644 --- a/modules/commands/gl_global.cpp +++ b/modules/commands/gl_global.cpp @@ -12,7 +12,6 @@ /*************************************************************************/ #include "module.h" -#include "global.h" class CommandGLGlobal : public Command { diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp index 0c29705ef..99c5a4811 100644 --- a/modules/commands/hs_request.cpp +++ b/modules/commands/hs_request.cpp @@ -16,7 +16,6 @@ */ #include "module.h" -#include "memoserv.h" static ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ"); diff --git a/modules/commands/ms_cancel.cpp b/modules/commands/ms_cancel.cpp index e0e917b5e..2ab605f40 100644 --- a/modules/commands/ms_cancel.cpp +++ b/modules/commands/ms_cancel.cpp @@ -12,9 +12,6 @@ /*************************************************************************/ #include "module.h" -#include "memoserv.h" - -static ServiceReference<MemoServService> MemoServService("MemoServService", "MemoServ"); class CommandMSCancel : public Command { @@ -27,10 +24,6 @@ class CommandMSCancel : public Command void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { - if (!MemoServService) - return; - - const Anope::string &nname = params[0]; bool ischan; @@ -81,9 +74,6 @@ class MSCancel : public Module MSCancel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmscancel(this) { - - if (!MemoServService) - throw ModuleException("No MemoServ!"); } }; diff --git a/modules/commands/ms_ignore.cpp b/modules/commands/ms_ignore.cpp index d1f33abdf..056b20128 100644 --- a/modules/commands/ms_ignore.cpp +++ b/modules/commands/ms_ignore.cpp @@ -13,7 +13,6 @@ #include "module.h" -#include "memoserv.h" static ServiceReference<MemoServService> MemoServService("MemoServService", "MemoServ"); diff --git a/modules/commands/ms_read.cpp b/modules/commands/ms_read.cpp index 0d269bd02..7e1e89236 100644 --- a/modules/commands/ms_read.cpp +++ b/modules/commands/ms_read.cpp @@ -12,7 +12,6 @@ /*************************************************************************/ #include "module.h" -#include "memoserv.h" static ServiceReference<MemoServService> MemoServService("MemoServService", "MemoServ"); diff --git a/modules/commands/ms_rsend.cpp b/modules/commands/ms_rsend.cpp index 19a20a279..a9372c328 100644 --- a/modules/commands/ms_rsend.cpp +++ b/modules/commands/ms_rsend.cpp @@ -12,7 +12,6 @@ /*************************************************************************/ #include "module.h" -#include "memoserv.h" namespace { diff --git a/modules/commands/ms_send.cpp b/modules/commands/ms_send.cpp index 18a609893..d4d63a383 100644 --- a/modules/commands/ms_send.cpp +++ b/modules/commands/ms_send.cpp @@ -12,9 +12,11 @@ /*************************************************************************/ #include "module.h" -#include "memoserv.h" -static ServiceReference<MemoServService> MemoServService("MemoServService", "MemoServ"); +namespace +{ + ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ"); +} class CommandMSSend : public Command { @@ -27,13 +29,13 @@ class CommandMSSend : public Command void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { - if (!MemoServService) + if (!memoserv) return; const Anope::string &nick = params[0]; const Anope::string &text = params[1]; - MemoServService::MemoResult result = MemoServService->Send(source.GetNick(), nick, text); + MemoServService::MemoResult result = memoserv->Send(source.GetNick(), nick, text); if (result == MemoServService::MEMO_SUCCESS) source.Reply(_("Memo sent to \002%s\002."), nick.c_str()); else if (result == MemoServService::MEMO_INVALID_TARGET) @@ -65,7 +67,7 @@ class MSSend : public Module commandmssend(this) { - if (!MemoServService) + if (!memoserv) throw ModuleException("No MemoServ!"); } }; diff --git a/modules/commands/ms_sendall.cpp b/modules/commands/ms_sendall.cpp index d823f7c5f..b19b96036 100644 --- a/modules/commands/ms_sendall.cpp +++ b/modules/commands/ms_sendall.cpp @@ -12,9 +12,11 @@ /*************************************************************************/ #include "module.h" -#include "memoserv.h" -static ServiceReference<MemoServService> MemoServService("MemoServService", "MemoServ"); +namespace +{ + ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ"); +} class CommandMSSendAll : public Command { @@ -27,7 +29,7 @@ class CommandMSSendAll : public Command void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { - if (!MemoServService) + if (!memoserv) return; const Anope::string &text = params[0]; @@ -43,11 +45,10 @@ class CommandMSSendAll : public Command const NickCore *nc = it->second; if (nc != source.nc) - MemoServService->Send(source.GetNick(), nc->display, text); + memoserv->Send(source.GetNick(), nc->display, text); } source.Reply(_("A massmemo has been sent to all registered users.")); - return; } bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override @@ -67,8 +68,7 @@ class MSSendAll : public Module MSSendAll(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmssendall(this) { - - if (!MemoServService) + if (!memoserv) throw ModuleException("No MemoServ!"); } }; diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp index dafb5a857..d1edaecca 100644 --- a/modules/commands/ms_set.cpp +++ b/modules/commands/ms_set.cpp @@ -13,11 +13,6 @@ #include "module.h" -namespace -{ - ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ"); -} - class CommandMSSet : public Command { private: diff --git a/modules/commands/ms_staff.cpp b/modules/commands/ms_staff.cpp index f9d5e81e5..30ec92b16 100644 --- a/modules/commands/ms_staff.cpp +++ b/modules/commands/ms_staff.cpp @@ -12,9 +12,11 @@ /*************************************************************************/ #include "module.h" -#include "memoserv.h" -static ServiceReference<MemoServService> MemoServService("MemoServService", "MemoServ"); +namespace +{ + ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ"); +} class CommandMSStaff : public Command { @@ -27,7 +29,7 @@ class CommandMSStaff : public Command void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { - if (!MemoServService) + if (!memoserv) return; const Anope::string &text = params[0]; @@ -43,10 +45,8 @@ class CommandMSStaff : public Command const NickCore *nc = it->second; if (source.nc != nc && nc->IsServicesOper()) - MemoServService->Send(source.GetNick(), nc->display, text, true); + memoserv->Send(source.GetNick(), nc->display, text, true); } - - return; } bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override @@ -67,8 +67,7 @@ class MSStaff : public Module MSStaff(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmsstaff(this) { - - if (!MemoServService) + if (!memoserv) throw ModuleException("No MemoServ!"); } }; diff --git a/modules/commands/ns_logout.cpp b/modules/commands/ns_logout.cpp index cdeab3add..c149dc1f2 100644 --- a/modules/commands/ns_logout.cpp +++ b/modules/commands/ns_logout.cpp @@ -12,7 +12,6 @@ /*************************************************************************/ #include "module.h" -#include "nickserv.h" static ServiceReference<NickServService> NickServService("NickServService", "NickServ"); diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp index 845c98915..e9455f88a 100644 --- a/modules/commands/ns_recover.cpp +++ b/modules/commands/ns_recover.cpp @@ -13,11 +13,6 @@ #include "module.h" -namespace -{ - bool restoreonrecover; -} - struct NSRecoverExtensibleInfo : ExtensibleItem, std::map<Anope::string, ChannelStatus> { }; class NSRecoverRequest : public IdentifyRequest @@ -61,7 +56,7 @@ class NSRecoverRequest : public IdentifyRequest Log(LOG_COMMAND, source, cmd) << "and was automatically identified to " << u->Account()->display; } - if (restoreonrecover) + if (Config->GetModule("ns_recover")->Get<bool>("restoreonrecover")) { if (!u->chans.empty()) { diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp index e0b8c77b5..a9dbce470 100644 --- a/modules/commands/ns_register.cpp +++ b/modules/commands/ns_register.cpp @@ -13,10 +13,6 @@ #include "module.h" -namespace -{ - ServiceReference<NickServService> nickserv("NickServService", "NickServ"); -} static bool SendRegmail(User *u, const NickAlias *na, const BotInfo *bi); class CommandNSConfirm : public Command diff --git a/modules/commands/os_defcon.cpp b/modules/commands/os_defcon.cpp index 0fd3a1700..a75d4691b 100644 --- a/modules/commands/os_defcon.cpp +++ b/modules/commands/os_defcon.cpp @@ -12,8 +12,7 @@ /*************************************************************************/ #include "module.h" -#include "global.h" -#include "os_session.h" +#include "modules/os_session.h" enum DefconLevel { diff --git a/modules/commands/os_dns.cpp b/modules/commands/os_dns.cpp index ebfa16227..698fa0e1a 100644 --- a/modules/commands/os_dns.cpp +++ b/modules/commands/os_dns.cpp @@ -6,7 +6,7 @@ */ #include "module.h" -#include "../dns.h" +#include "modules/dns.h" static ServiceReference<DNS::Manager> dnsmanager("DNS::Manager", "dns/manager"); diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp index 1d99d47b4..1d683a7e6 100644 --- a/modules/commands/os_forbid.cpp +++ b/modules/commands/os_forbid.cpp @@ -12,7 +12,7 @@ /*************************************************************************/ #include "module.h" -#include "os_forbid.h" +#include "modules/os_forbid.h" static ServiceReference<NickServService> nickserv("NickServService", "NickServ"); diff --git a/modules/commands/os_ignore.cpp b/modules/commands/os_ignore.cpp index 073101066..08aaeaaf3 100644 --- a/modules/commands/os_ignore.cpp +++ b/modules/commands/os_ignore.cpp @@ -12,7 +12,7 @@ /*************************************************************************/ #include "module.h" -#include "os_ignore.h" +#include "modules/os_ignore.h" class OSIgnoreService : public IgnoreService { diff --git a/modules/commands/os_news.cpp b/modules/commands/os_news.cpp index 7292b6471..e9f70b693 100644 --- a/modules/commands/os_news.cpp +++ b/modules/commands/os_news.cpp @@ -12,8 +12,7 @@ /*************************************************************************/ #include "module.h" -#include "global.h" -#include "os_news.h" +#include "modules/os_news.h" /* List of messages for each news type. This simplifies message sending. */ diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp index 74f6c2f7e..42449e44b 100644 --- a/modules/commands/os_session.cpp +++ b/modules/commands/os_session.cpp @@ -12,7 +12,7 @@ /*************************************************************************/ #include "module.h" -#include "os_session.h" +#include "modules/os_session.h" namespace { diff --git a/modules/commands/os_stats.cpp b/modules/commands/os_stats.cpp index 04bd6e60d..8b975a6c7 100644 --- a/modules/commands/os_stats.cpp +++ b/modules/commands/os_stats.cpp @@ -12,7 +12,7 @@ /*************************************************************************/ #include "module.h" -#include "os_session.h" +#include "modules/os_session.h" struct Stats : Serializable { diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index 52d61bfad..fd499d0cb 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -11,7 +11,7 @@ /*************************************************************************/ #include "module.h" -#include "../commands/os_session.h" +#include "modules/os_session.h" #define READ(x) \ if (true) \ diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp index 76a2aa455..3c6324b6f 100644 --- a/modules/database/db_plain.cpp +++ b/modules/database/db_plain.cpp @@ -11,7 +11,7 @@ /*************************************************************************/ #include "module.h" -#include "../commands/os_session.h" +#include "modules/os_session.h" Anope::string DatabaseFile; Anope::string BackupFile; diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp index 400619159..145857614 100644 --- a/modules/database/db_sql.cpp +++ b/modules/database/db_sql.cpp @@ -9,7 +9,7 @@ */ #include "module.h" -#include "sql.h" +#include "modules/sql.h" using namespace SQL; diff --git a/modules/database/db_sql_live.cpp b/modules/database/db_sql_live.cpp index a7116892d..091febda7 100644 --- a/modules/database/db_sql_live.cpp +++ b/modules/database/db_sql_live.cpp @@ -1,6 +1,5 @@ #include "module.h" -#include "sql.h" -#include "../commands/os_session.h" +#include "modules/sql.h" using namespace SQL; diff --git a/modules/m_dns.cpp b/modules/m_dns.cpp index 6bcccc3e1..4dc419d7c 100644 --- a/modules/m_dns.cpp +++ b/modules/m_dns.cpp @@ -11,7 +11,7 @@ */ #include "module.h" -#include "dns.h" +#include "modules/dns.h" using namespace DNS; diff --git a/modules/m_dnsbl.cpp b/modules/m_dnsbl.cpp index 1f5a9b984..9e30c49ce 100644 --- a/modules/m_dnsbl.cpp +++ b/modules/m_dnsbl.cpp @@ -6,7 +6,7 @@ */ #include "module.h" -#include "dns.h" +#include "modules/dns.h" using namespace DNS; diff --git a/modules/pseudoclients/global.cpp b/modules/pseudoclients/global.cpp index 837200e5d..501b02194 100644 --- a/modules/pseudoclients/global.cpp +++ b/modules/pseudoclients/global.cpp @@ -12,7 +12,6 @@ /*************************************************************************/ #include "module.h" -#include "global.h" class MyGlobalService : public GlobalService { diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp index 46ad82194..499722686 100644 --- a/modules/pseudoclients/memoserv.cpp +++ b/modules/pseudoclients/memoserv.cpp @@ -12,7 +12,6 @@ /*************************************************************************/ #include "module.h" -#include "memoserv.h" static bool SendMemoMail(NickCore *nc, MemoInfo *mi, Memo *m) { diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 3f4250fb6..1177f9327 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -12,13 +12,11 @@ /*************************************************************************/ #include "module.h" -#include "nickserv.h" class NickServCollide; typedef std::map<Anope::string, NickServCollide *> nickservcollides_map; -static ServiceReference<NickServService> nickserv("NickServService", "NickServ"); static nickservcollides_map NickServCollides; /** Timer for colliding nicks to force people off of nicknames diff --git a/src/memos.cpp b/src/memos.cpp index 065a644f6..b3f044e1e 100644 --- a/src/memos.cpp +++ b/src/memos.cpp @@ -13,7 +13,6 @@ #include "services.h" #include "modules.h" #include "service.h" -#include "memoserv.h" #include "memo.h" #include "users.h" #include "account.h" diff --git a/src/users.cpp b/src/users.cpp index 61d27deb1..69ecc9eaf 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -21,7 +21,6 @@ #include "bots.h" #include "config.h" #include "opertype.h" -#include "nickserv.h" #include "language.h" user_map UserListByNick, UserListByUID; |