From 4b1e76c3bb7baa5ece83779889a46420ded3e495 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 10 Jul 2010 19:08:16 -0400 Subject: [PATCH] Added ns_set_misc and cs_set_misc. These modules allows users to configure settable options in /ns and /cs set that will be displayed in /ns and /cs info. Removed os_info, cs_set_url, ns_set_url, cs_set_email, ns_set_icq --- data/example.conf | 39 ++- docs/Changes.conf | 1 + include/account.h | 2 - include/regchannel.h | 2 - lang/cat.l | 207 +------------- lang/de.l | 94 +------ lang/en_us.l | 97 +------ lang/es.l | 97 +------ lang/fr.l | 98 +------ lang/gr.l | 97 +------ lang/hun.l | 94 +------ lang/it.l | 97 +------ lang/nl.l | 97 +------ lang/pl.l | 106 +------ lang/pt.l | 97 +------ lang/ru.l | 93 +------ lang/tr.l | 98 +------ src/chanserv.cpp | 4 - src/core/cs_info.cpp | 4 - src/core/cs_set_email.cpp | 103 ------- src/core/cs_set_entrymsg.cpp | 2 +- src/core/cs_set_url.cpp | 111 -------- src/core/db_plain.cpp | 16 -- src/core/ns_group.cpp | 3 - src/core/ns_info.cpp | 4 - src/core/ns_set_icq.cpp | 133 --------- src/core/ns_set_url.cpp | 125 --------- src/modules/cs_set_misc.cpp | 196 +++++++++++++ src/modules/os_info.cpp | 515 ----------------------------------- src/nickcore.cpp | 6 +- src/nickserv.cpp | 2 - src/regchannel.cpp | 6 +- 32 files changed, 291 insertions(+), 2355 deletions(-) delete mode 100644 src/core/cs_set_email.cpp delete mode 100644 src/core/cs_set_url.cpp delete mode 100644 src/core/ns_set_icq.cpp delete mode 100644 src/core/ns_set_url.cpp create mode 100644 src/modules/cs_set_misc.cpp delete mode 100644 src/modules/os_info.cpp diff --git a/data/example.conf b/data/example.conf index d66e98611..6c5c87bc7 100644 --- a/data/example.conf +++ b/data/example.conf @@ -979,7 +979,7 @@ chanserv * The core modules to load for ChanServ. This is a space separated list that corresponds * to the base names of the modules for ChanServ. This directive is optional, but highly recommended. */ - modules = "cs_help cs_register cs_set cs_saset cs_set_bantype cs_set_description cs_set_email cs_set_entrymsg cs_set_founder cs_set_keeptopic cs_set_mlock cs_set_opnotice cs_set_peace cs_set_persist cs_set_private cs_set_restricted cs_set_secure cs_set_securefounder cs_set_secureops cs_set_signkick cs_set_successor cs_set_topiclock cs_set_url cs_set_xop cs_xop cs_access cs_akick cs_drop cs_ban cs_clear cs_modes cs_getkey cs_invite cs_kick cs_list cs_topic cs_info cs_forbid cs_suspend cs_status cs_unban" + modules = "cs_help cs_register cs_set cs_saset cs_set_bantype cs_set_description cs_set_entrymsg cs_set_founder cs_set_keeptopic cs_set_mlock cs_set_opnotice cs_set_peace cs_set_persist cs_set_private cs_set_restricted cs_set_secure cs_set_securefounder cs_set_secureops cs_set_signkick cs_set_successor cs_set_topiclock cs_set_xop cs_xop cs_access cs_akick cs_drop cs_ban cs_clear cs_modes cs_getkey cs_invite cs_kick cs_list cs_topic cs_info cs_forbid cs_suspend cs_status cs_unban" /* * The default options for newly registered channels. Note that changing these options @@ -1553,7 +1553,6 @@ module { name = "os_ignore" } module { name = "cs_appendtopic" } module { name = "cs_enforce" } module { name = "ns_maxemail" } -module { name = "os_info" } module { name = "hs_request" } /* @@ -1577,6 +1576,42 @@ db_plain database = "anope.db" } +module { name = "cs_set_misc" } +cs_set_misc +{ + name = "OINFO" + desc = "Associate oper only information to this channel" + operonly = yes +} +cs_set_misc +{ + name = "URL" + desc = "Associate a URL with the channel" +} +cs_set_misc +{ + name = "EMail" + desc = "Associate an EMail with the channel" +} + +module { name = "ns_set_misc" } +ns_set_misc +{ + name = "OINFO" + desc = "Associate oper only information to this nick" + operonly = yes +} +ns_set_misc +{ + name = "URL" + desc = "Associate a URl with the nick" +} +ns_set_misc +{ + name = "ICQ" + desc = "Associate an ICQ number with the nick" +} + #module { name = "m_helpchan" } m_helpchan { diff --git a/docs/Changes.conf b/docs/Changes.conf index bad0cf57b..8cc990c3a 100644 --- a/docs/Changes.conf +++ b/docs/Changes.conf @@ -9,6 +9,7 @@ nickserv:modules added many new ns_set_command modules chanserv:modules added many new cs_set_command modules opertype:commands added nickserv/saset/* and chanserv/saset/* options:socketengine added to choose what socket engine to use +module:cs_set_misc and module:ns_set_misc added to replace the old set url/icq/email modules ** MODIFIED CONFIGURATION DIRECTIVES ** opertype:commands changed operserv/sgline to opserv/snline diff --git a/include/account.h b/include/account.h index 7644d9d89..82ccb3871 100644 --- a/include/account.h +++ b/include/account.h @@ -153,8 +153,6 @@ class CoreExport NickCore : public Extensible, public Flags access; /* Access list, vector of strings */ MemoInfo memos; diff --git a/include/regchannel.h b/include/regchannel.h index ec04134f1..266b057d7 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -86,8 +86,6 @@ class CoreExport ChannelInfo : public Extensible, public Flags