diff options
| author | Kim Alvefur <zash@zash.se> | 2016-07-08 22:01:10 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-07-08 22:01:10 +0200 |
| commit | c14840340a365a79517ff455b3e84d25ef62c159 (patch) | |
| tree | e5339d0c057334591e52af0777588890d51081a5 /plugins | |
| parent | 01e9c0fcaece58c4b70ffcb2e6f3df8e15f03f7b (diff) | |
| parent | c53e625e427b1197b45ac9bbdf192cb07c6f2285 (diff) | |
| download | prosody-c14840340a365a79517ff455b3e84d25ef62c159.tar.gz prosody-c14840340a365a79517ff455b3e84d25ef62c159.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 5 | ||||
| -rw-r--r-- | plugins/mod_presence.lua | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 4f11d8ea..dd583663 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -769,7 +769,6 @@ local function print_errors(print, errors) 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 @@ local function check_muc(jid) 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 diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index cf762edc..e4a317bc 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -130,7 +130,7 @@ function send_presence_of_available_resources(user, host, jid, recipient_session if h and h.type == "local" then local u = h.sessions[user]; if u then - for k, session in pairs(u.sessions) do + for _, session in pairs(u.sessions) do local pres = session.presence; if pres then if stanza then pres = stanza; pres.attr.from = session.full_jid; end |