diff options
| author | Adam <adam@sigterm.info> | 2013-02-05 08:04:45 -0800 |
|---|---|---|
| committer | Adam <adam@sigterm.info> | 2013-02-05 08:04:45 -0800 |
| commit | 2472a41561d178dc0b6167dc1837df7cc1d52945 (patch) | |
| tree | 07e98e6b3c01b752ed8d2974e256ea617e1aeddf | |
| parent | 25cec015e8276ea6e1de3e290696071fa5c0b66f (diff) | |
| parent | 65fbdcfa87f32818eb6591e1a9fd2dd191ec2b95 (diff) | |
Merge pull request #9 from Robby-/1.9-ns_set_misc
Fixed ns_set_misc not showing help for its SASET commands
| -rw-r--r-- | data/nickserv.example.conf | 9 | ||||
| -rw-r--r-- | modules/commands/ns_set_misc.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index be36e0e4a..07f55f05f 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -551,9 +551,12 @@ command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/sas module { name = "ns_set_misc" } command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc"; misc_description = _("Associate a URL with your account"); } command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/misc"; misc_description = _("Associate a URL with this account"); permission = "nickserv/saset/url"; group = "nickserv/admin"; } -#command { service = "NickServ"; name = "SET ICQ"; command = "nickserv/set/misc"; } -#command { service = "NickServ"; name = "SET TWITTER"; command = "nickserv/set/misc"; } -#command { service = "NickServ"; name = "SET FACEBOOK"; command = "nickserv/set/misc"; } +#command { service = "NickServ"; name = "SET ICQ"; command = "nickserv/set/misc"; misc_description = _("Associate an ICQ account with your account"); } +#command { service = "NickServ"; name = "SASET ICQ"; command = "nickserv/saset/misc"; misc_description = _("Associate an ICQ account with this account"); permission = "nickserv/saset/icq"; group = "nickserv/admin"; } +#command { service = "NickServ"; name = "SET TWITTER"; command = "nickserv/set/misc"; misc_description = _("Associate a Twitter account with your account"); } +#command { service = "NickServ"; name = "SASET TWITTER"; command = "nickserv/saset/misc"; misc_description = _("Associate a Twitter account with this account"); permission = "nickserv/saset/twitter"; group = "nickserv/admin"; } +#command { service = "NickServ"; name = "SET FACEBOOK"; command = "nickserv/set/misc"; misc_description = _("Associate a Facebook URL with your account"); } +#command { service = "NickServ"; name = "SASET FACEBOOK"; command = "nickserv/saset/misc"; misc_description = _("Associate a Facebook URL with this account"); permission = "nickserv/saset/facebook"; group = "nickserv/admin"; } /* * ns_status diff --git a/modules/commands/ns_set_misc.cpp b/modules/commands/ns_set_misc.cpp index d3d1bc058..a5a0019b6 100644 --- a/modules/commands/ns_set_misc.cpp +++ b/modules/commands/ns_set_misc.cpp @@ -173,7 +173,7 @@ class NSSetMisc : public Module for (int i = 0; i < config.Enumerate("command"); ++i) { - if (config.ReadValue("command", "command", "", i) != "nickserv/set/misc") + if (config.ReadValue("command", "command", "", i) != "nickserv/set/misc" && config.ReadValue("command", "command", "", i) != "nickserv/saset/misc") continue; Anope::string cname = config.ReadValue("command", "name", "", i); |