From 07ed06ebe56acbbd34b12ea0111b8fdcbf82a633 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 13 Aug 2019 18:06:19 +0100 Subject: Rewrite and merge LocalStringExt, StringExtItem. --- src/modules/m_cgiirc.cpp | 6 +++--- src/modules/m_conn_waitpong.cpp | 2 +- src/modules/m_customtitle.cpp | 2 +- src/modules/m_dnsbl.cpp | 6 +++--- src/modules/m_ldapauth.cpp | 4 ++-- src/modules/m_mlock.cpp | 2 +- src/modules/m_redirect.cpp | 4 ++-- src/modules/m_services_account.cpp | 2 +- src/modules/m_swhois.cpp | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 2b12a3849..871f4f1a0 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -124,9 +124,9 @@ class CommandWebIRC : public SplitCommand CommandWebIRC(Module* Creator) : SplitCommand(Creator, "WEBIRC", 4) - , gateway(Creator, "cgiirc_gateway", ExtensionItem::EXT_USER) - , realhost(Creator, "cgiirc_realhost", ExtensionItem::EXT_USER) - , realip(Creator, "cgiirc_realip", ExtensionItem::EXT_USER) + , gateway(Creator, "cgiirc_gateway", ExtensionItem::EXT_USER, true) + , realhost(Creator, "cgiirc_realhost", ExtensionItem::EXT_USER, true) + , realip(Creator, "cgiirc_realip", ExtensionItem::EXT_USER, true) , sslapi(Creator) , webircevprov(Creator, "event/webirc") { diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp index a2de2095d..fdf935ba3 100644 --- a/src/modules/m_conn_waitpong.cpp +++ b/src/modules/m_conn_waitpong.cpp @@ -28,7 +28,7 @@ class ModuleWaitPong : public Module { bool sendsnotice; bool killonbadreply; - LocalStringExt ext; + StringExtItem ext; public: ModuleWaitPong() diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index f9c528845..5a544c2a8 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -73,7 +73,7 @@ class CommandTitle : public Command CommandTitle(Module* Creator) : Command(Creator,"TITLE", 2) - , ctitle(Creator, "ctitle", ExtensionItem::EXT_USER) + , ctitle(Creator, "ctitle", ExtensionItem::EXT_USER, true) { syntax = " "; } diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 2e6b40270..b04e2a54b 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -48,13 +48,13 @@ class DNSBLConfEntry : public refcountbase class DNSBLResolver : public DNS::Request { std::string theiruid; - LocalStringExt& nameExt; + StringExtItem& nameExt; LocalIntExt& countExt; reference ConfEntry; public: - DNSBLResolver(DNS::Manager *mgr, Module *me, LocalStringExt& match, LocalIntExt& ctr, const std::string &hostname, LocalUser* u, reference conf) + DNSBLResolver(DNS::Manager *mgr, Module *me, StringExtItem& match, LocalIntExt& ctr, const std::string &hostname, LocalUser* u, reference conf) : DNS::Request(mgr, me, hostname, DNS::QUERY_A, true), theiruid(u->uuid), nameExt(match), countExt(ctr), ConfEntry(conf) { } @@ -234,7 +234,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener { DNSBLConfList DNSBLConfEntries; dynamic_reference DNS; - LocalStringExt nameExt; + StringExtItem nameExt; LocalIntExt countExt; /* diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp index 84665623f..52b652f49 100644 --- a/src/modules/m_ldapauth.cpp +++ b/src/modules/m_ldapauth.cpp @@ -34,7 +34,7 @@ namespace LocalIntExt* authed; bool verbose; std::string vhost; - LocalStringExt* vhosts; + StringExtItem* vhosts; std::vector > requiredattributes; } @@ -297,7 +297,7 @@ class ModuleLDAPAuth : public Module { dynamic_reference LDAP; LocalIntExt ldapAuthed; - LocalStringExt ldapVhost; + StringExtItem ldapVhost; std::string base; std::string attribute; std::vector allowpatterns; diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp index 28fd64d1c..c1cffbf4f 100644 --- a/src/modules/m_mlock.cpp +++ b/src/modules/m_mlock.cpp @@ -31,7 +31,7 @@ class ModuleMLock : public Module public: ModuleMLock() - : mlock(this, "mlock", ExtensionItem::EXT_CHANNEL) + : mlock(this, "mlock", ExtensionItem::EXT_CHANNEL, true) { } diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 49ebdcdce..559fbd27c 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -26,11 +26,11 @@ /** Handle channel mode +L */ -class Redirect : public ParamMode +class Redirect : public ParamMode { public: Redirect(Module* Creator) - : ParamMode(Creator, "redirect", 'L') + : ParamMode(Creator, "redirect", 'L') { syntax = ""; } diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index d6308781e..57eaf827f 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -104,7 +104,7 @@ class AccountExtItemImpl : public AccountExtItem public: AccountExtItemImpl(Module* mod) - : AccountExtItem(mod, "accountname", ExtensionItem::EXT_USER) + : AccountExtItem(mod, "accountname", ExtensionItem::EXT_USER, true) , eventprov(mod, "event/account") { } diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index ca53735a8..3af8f6565 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -42,7 +42,7 @@ class CommandSwhois : public Command CommandSwhois(Module* Creator) : Command(Creator, "SWHOIS", 2, 2) , operblock(Creator, "swhois_operblock", ExtensionItem::EXT_USER) - , swhois(Creator, "swhois", ExtensionItem::EXT_USER) + , swhois(Creator, "swhois", ExtensionItem::EXT_USER, true) { flags_needed = 'o'; syntax = " :"; translation = { TR_NICK, TR_TEXT }; -- cgit v1.3.1-10-gc9f91