diff options
| author | DukePyrolator <DukePyrolator@anope.org> | 2011-08-23 11:42:40 +0200 |
|---|---|---|
| committer | DukePyrolator <DukePyrolator@anope.org> | 2011-08-23 11:42:40 +0200 |
| commit | 2284c31f904e08ba3fa0b10040878abb1dc5afae (patch) | |
| tree | 2a2b636b3cfd52fe362f7bf5f9189ef40af25ca4 | |
| parent | b5b2c422421b7544c00a51151ce1bc43e4f5e6de (diff) | |
Replaced some chanserv/forbid with operserv/forbid in example.conf and added a check for ForceForbidReason in os_forbid
| -rw-r--r-- | data/example.conf | 7 | ||||
| -rw-r--r-- | modules/commands/os_forbid.cpp | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/data/example.conf b/data/example.conf index d4507d055..d663c8780 100644 --- a/data/example.conf +++ b/data/example.conf @@ -691,7 +691,7 @@ log log { target = "globops" - admin = "global/* operserv/mode operserv/kick opeserv/akill operserv/s*line operserv/noop operserv/jupe */forbid nickserv/getpass */drop" + admin = "global/* operserv/mode operserv/kick operserv/akill operserv/s*line operserv/noop operserv/jupe */forbid nickserv/getpass */drop" } /* @@ -724,9 +724,8 @@ log * botserv/bot/del botserv/bot/add botserv/bot/change botserv/assign/private * botserv/botlist botserv/set/private botserv/set/nobot * - * chanserv/access/list chanserv/drop chanserv/forbid chanserv/getkey + * chanserv/access/list chanserv/drop chanserv/getkey chanserv/mode * chanserv/list chanserv/suspend chanserv/topic chanserv/status - * chanserv/mode * * chanserv/saset/bantype chanserv/saset/description chanserv/saset/email chanserv/saset/entrymsg * chanserv/saset/founder chanserv/saset/keeptopic chanserv/saset/opnotice chanserv/saset/restricted @@ -805,7 +804,7 @@ opertype inherits = "Services Operator" - commands = "chanserv/access/list chanserv/drop chanserv/forbid chanserv/getkey chanserv/saset/noexpire memoserv/sendall nickserv/saset/* nickserv/getemail operserv/news operserv/jupe operserv/svsnick operserv/stats operserv/oline operserv/noop global/*" + commands = "chanserv/access/list chanserv/drop chanserv/getkey chanserv/saset/noexpire memoserv/sendall nickserv/saset/* nickserv/getemail operserv/news operserv/jupe operserv/svsnick operserv/stats operserv/oline operserv/noop operserv/forbid global/*" privs = "*" } diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp index e982c3305..ffa5503e7 100644 --- a/modules/commands/os_forbid.cpp +++ b/modules/commands/os_forbid.cpp @@ -108,6 +108,13 @@ class CommandOSForbid : public Command Anope::string reason = !expiry.empty() && params.size() > 4 ? params[4] : (params.size() > 3 ? params[3] : ""); time_t expiryt = 0; + + if (Config->ForceForbidReason && reason.empty()) + { + this->OnSyntaxError(source, ""); + return; + } + if (!expiry.empty()) { expiryt = dotime(expiry); |