From 928a5a29d6783e8d6719c39dac3e9e8f29f5e01d Mon Sep 17 00:00:00 2001 From: Greg Taylor Date: Tue, 22 May 2007 23:53:05 +0000 Subject: [PATCH] Fix a problem with @cemit permissions. --- cmdtable.py | 4 ++-- commands_comsys.py | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmdtable.py b/cmdtable.py index 7e08a6e7b0..99c888bd43 100644 --- a/cmdtable.py +++ b/cmdtable.py @@ -45,7 +45,7 @@ ctable = { "who": (commands_general.cmd_who, None), "@ccreate": (commands_comsys.cmd_ccreate, ("objects.add_commchannel")), "@cdestroy": (commands_comsys.cmd_cdestroy, ("objects.delete_commchannel")), - "@cemit": (commands_comsys.cmd_cemit, ("objects.emit_commchannel")), + "@cemit": (commands_comsys.cmd_cemit, None), "@clist": (commands_comsys.cmd_clist, None), "@create": (commands_privileged.cmd_create, ("genperms.builder")), "@description": (commands_privileged.cmd_description, None), @@ -78,4 +78,4 @@ def return_cmdtuple(func_name, unlogged_cmd=False): else: cfunc = uncon_ctable.get(func_name, False) - return cfunc \ No newline at end of file + return cfunc diff --git a/commands_comsys.py b/commands_comsys.py index 9d47b3ddbc..bf4f868e0b 100644 --- a/commands_comsys.py +++ b/commands_comsys.py @@ -231,11 +231,17 @@ def cmd_cemit(cdat): return if "noheader" in switches: + if not pobject.user_has_perm("objects.emit_commchannel"): + session.msg(defines_global.NOPERMS_MSG) + return final_cmessage = cmessage else: - if "sendername": + if "sendername" in switches: final_cmessage = "[%s] %s: %s" % (cname_parsed, pobject.get_name(show_dbref=False), cmessage) else: + if not pobject.user_has_perm("objects.emit_commchannel"): + session.msg(defines_global.NOPERMS_MSG) + return final_cmessage = "[%s] %s" % (cname_parsed, cmessage) if not "quiet" in switches: