diff options
Diffstat (limited to 'modules/operserv')
| -rw-r--r-- | modules/operserv/os_akill.cpp | 87 | ||||
| -rw-r--r-- | modules/operserv/os_session.cpp | 99 |
2 files changed, 100 insertions, 86 deletions
diff --git a/modules/operserv/os_akill.cpp b/modules/operserv/os_akill.cpp index 0cb2f51d3..b31f5404d 100644 --- a/modules/operserv/os_akill.cpp +++ b/modules/operserv/os_akill.cpp @@ -422,27 +422,28 @@ public: this->SendSyntax(source); source.Reply(" "); source.Reply(_( - "Allows Services Operators to manipulate the AKILL list. If " - "a user matching an AKILL mask attempts to connect, services " - "will issue a KILL for that user and, on supported server " - "types, will instruct all servers to add a ban for the mask " - "which the user matched." - "\n\n" - "\002AKILL\032ADD\002 adds the given mask to the AKILL " - "list for the given reason, which \002must\002 be given. " - "Mask should be in the format of nick!user@host#real\032name, " - "though all that is required is user@host. If a real name is specified, " - "the reason must be prepended with a :. " - "\037expiry\037 is specified as an integer followed by one of \037d\037 " - "(days), \037h\037 (hours), or \037m\037 (minutes). Combinations (such as " - "\0371h30m\037) are not permitted. If a unit specifier is not " - "included, the default is days (so \037+30\037 by itself means 30 " - "days). To add an AKILL which does not expire, use \037+0\037. If the " - "usermask to be added starts with a \037+\037, an expiry time must " - "be given, even if it is the same as the default. The " - "current AKILL default expiry time can be found with the " - "\002STATS\032AKILL\002 command." - )); + "Allows Services Operators to manipulate the AKILL list. If " + "a user matching an AKILL mask attempts to connect, services " + "will issue a KILL for that user and, on supported server " + "types, will instruct all servers to add a ban for the mask " + "which the user matched." + "\n\n" + "\002%s\032ADD\002 adds the given mask to the AKILL " + "list for the given reason, which \002must\002 be given. " + "Mask should be in the format of nick!user@host#real\032name, " + "though all that is required is user@host. If a real name is specified, " + "the reason must be prepended with a :. " + "\037expiry\037 is specified as an integer followed by one of \037d\037 " + "(days), \037h\037 (hours), or \037m\037 (minutes). Combinations (such as " + "\0371h30m\037) are not permitted. If a unit specifier is not " + "included, the default is days (so \037+30\037 by itself means 30 " + "days). To add an AKILL which does not expire, use \037+0\037. If the " + "usermask to be added starts with a \037+\037, an expiry time must " + "be given, even if it is the same as the default. The " + "current AKILL default expiry time can be found with the " + "\002STATS\032AKILL\002 command." + ), + source.command.nobreak().c_str()); const Anope::string ®exengine = Config->GetBlock("options").Get<const Anope::string>("regexengine"); if (!regexengine.empty()) @@ -457,25 +458,31 @@ public: source.Reply(" "); source.Reply(_( - "The \002AKILL\032DEL\002 command removes the given mask from the " - "AKILL list if it is present. If a list of entry numbers is " - "given, those entries are deleted. (See the example for LIST " - "below.)" - "\n\n" - "The \002AKILL\032LIST\002 command displays the AKILL list. " - "If a wildcard mask is given, only those entries matching the " - "mask are displayed. If a list of entry numbers is given, " - "only those entries are shown; for example:\n" - " \002AKILL\032LIST\0322-5,7-9\002\n" - " Lists AKILL entries numbered 2 through 5 and 7\n" - " through 9." - "\n\n" - "\002AKILL\032VIEW\002 is a more verbose version of \002AKILL\032LIST\002, and " - "will show who added an AKILL, the date it was added, and when " - "it expires, as well as the user@host/ip mask and reason." - "\n\n" - "\002AKILL\032CLEAR\002 clears all entries of the AKILL list." - )); + "The \002%s\032DEL\002 command removes the given mask from the " + "AKILL list if it is present. If a list of entry numbers is " + "given, those entries are deleted. (See the example for LIST " + "below.)" + "\n\n" + "The \002%s\032LIST\002 command displays the AKILL list. " + "If a wildcard mask is given, only those entries matching the " + "mask are displayed. If a list of entry numbers is given, " + "only those entries are shown; for example:\n" + " \002%s\032LIST\0322-5,7-9\002\n" + " Lists AKILL entries numbered 2 through 5 and 7\n" + " through 9." + "\n\n" + "\002%s\032VIEW\002 is a more verbose version of \002%s\032LIST\002, and " + "will show who added an AKILL, the date it was added, and when " + "it expires, as well as the user@host/ip mask and reason." + "\n\n" + "\002%s\032CLEAR\002 clears all entries of the AKILL list." + ), + source.command.nobreak().c_str(), + source.command.nobreak().c_str(), + source.command.nobreak().c_str(), + source.command.nobreak().c_str(), + source.command.nobreak().c_str(), + source.command.nobreak().c_str()); return true; } }; diff --git a/modules/operserv/os_session.cpp b/modules/operserv/os_session.cpp index 34e9e7ed0..de554140b 100644 --- a/modules/operserv/os_session.cpp +++ b/modules/operserv/os_session.cpp @@ -300,21 +300,23 @@ public: this->SendSyntax(source); source.Reply(" "); source.Reply(_( - "Allows Services Operators to view the session list." - "\n\n" - "\002SESSION\032LIST\002 lists hosts with at least \037threshold\037 sessions. " - "The threshold must be a number greater than 1. This is to " - "prevent accidental listing of the large number of single " - "session hosts." - "\n\n" - "\002SESSION\032VIEW\002 displays detailed information about a specific " - "host - including the current session count and session limit. " - "The \037host\037 value may not include wildcards. " - "\n\n" - "See the \002EXCEPTION\002 help for more information about session " - "limiting and how to set session limits specific to certain " - "hosts and groups thereof." - )); + "Allows Services Operators to view the session list." + "\n\n" + "\002%s\032LIST\002 lists hosts with at least \037threshold\037 sessions. " + "The threshold must be a number greater than 1. This is to " + "prevent accidental listing of the large number of single " + "session hosts." + "\n\n" + "\002%s\032VIEW\002 displays detailed information about a specific " + "host - including the current session count and session limit. " + "The \037host\037 value may not include wildcards. " + "\n\n" + "See the \002EXCEPTION\002 help for more information about session " + "limiting and how to set session limits specific to certain " + "hosts and groups thereof." + ), + source.command.nobreak().c_str(), + source.command.nobreak().c_str()); return true; } }; @@ -578,37 +580,42 @@ public: this->SendSyntax(source); source.Reply(" "); source.Reply(_( - "Allows Services Operators to manipulate the list of hosts that " - "have specific session limits - allowing certain machines, " - "such as shell servers, to carry more than the default number " - "of clients at a time. Once a host reaches its session limit, " - "all clients attempting to connect from that host will be " - "killed. Before the user is killed, they are notified, of a " - "source of help regarding session limiting. The content of " - "this notice is a config setting." - "\n\n" - "\002EXCEPTION\032ADD\002 adds the given host mask to the exception list. " - "Note that \002nick!user@host\002 and \002user@host\002 masks are invalid! " - "Only real host masks, such as \002box.host.dom\002 and \002*.host.dom\002, " - "are allowed because sessions limiting does not take nick or " - "user names into account. \037limit\037 must be a number greater than " - "or equal to zero. This determines how many sessions this host " - "may carry at a time. A value of zero means the host has an " - "unlimited session limit. See the \002AKILL\002 help for details about " - "the format of the optional \037expiry\037 parameter. " - "\n\n" - "\002EXCEPTION\032DEL\002 removes the given mask from the exception list." - "\n\n" - "\002EXCEPTION\032LIST\002 and \002EXCEPTION\032VIEW\002 show all current " - "sessions if the optional mask is given, the list is limited " - "to those sessions matching the mask. The difference is that " - "\002EXCEPTION\032VIEW\002 is more verbose, displaying the name of the " - "person who added the exception, its session limit, reason, " - "host mask and the expiry date and time. " - "\n\n" - "Note that a connecting client will \"use\" the first exception " - "their host matches." - )); + "Allows Services Operators to manipulate the list of hosts that " + "have specific session limits - allowing certain machines, " + "such as shell servers, to carry more than the default number " + "of clients at a time. Once a host reaches its session limit, " + "all clients attempting to connect from that host will be " + "killed. Before the user is killed, they are notified, of a " + "source of help regarding session limiting. The content of " + "this notice is a config setting." + "\n\n" + "\002%s\032ADD\002 adds the given host mask to the exception list. " + "Note that \002nick!user@host\002 and \002user@host\002 masks are invalid! " + "Only real host masks, such as \002box.host.dom\002 and \002*.host.dom\002, " + "are allowed because sessions limiting does not take nick or " + "user names into account. \037limit\037 must be a number greater than " + "or equal to zero. This determines how many sessions this host " + "may carry at a time. A value of zero means the host has an " + "unlimited session limit. See the \002AKILL\002 help for details about " + "the format of the optional \037expiry\037 parameter. " + "\n\n" + "\002%s\032DEL\002 removes the given mask from the exception list." + "\n\n" + "\002%s\032LIST\002 and \002%s\032VIEW\002 show all current " + "sessions if the optional mask is given, the list is limited " + "to those sessions matching the mask. The difference is that " + "\002%s\032VIEW\002 is more verbose, displaying the name of the " + "person who added the exception, its session limit, reason, " + "host mask and the expiry date and time. " + "\n\n" + "Note that a connecting client will \"use\" the first exception " + "their host matches." + ), + source.command.nobreak().c_str(), + source.command.nobreak().c_str(), + source.command.nobreak().c_str(), + source.command.nobreak().c_str(), + source.command.nobreak().c_str()); return true; } }; |