Software /
code /
prosody
Diff
plugins/mod_admin_telnet.lua @ 7477:f9e470026042
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Fri, 08 Jul 2016 22:01:10 +0200 |
parent | 7359:a5a080c12c96 |
parent | 7474:701989ab904f |
child | 7640:279f348e9a92 |
line wrap: on
line diff
--- a/plugins/mod_admin_telnet.lua Fri Jul 08 15:12:44 2016 +0200 +++ b/plugins/mod_admin_telnet.lua Fri Jul 08 22:01:10 2016 +0200 @@ -769,7 +769,6 @@ end function def_env.s2s:showcert(domain) - local ser = require "util.serialization".serialize; local print = self.session.print; local s2s_sessions = module:shared"/*/s2s/sessions"; local domain_sessions = set.new(array.collect(values(s2s_sessions))) @@ -994,11 +993,11 @@ end function def_env.muc:create(room_jid) - local room, host = check_muc(room_jid); + local room_name, host = check_muc(room_jid); if not room_name then return room_name, host; end - if not room then return nil, host end + if not room_name then return nil, host end if hosts[host].modules.muc.rooms[room_jid] then return nil, "Room exists already" end return hosts[host].modules.muc.create_room(room_jid); end