mod_roster: When an user is deleted, unsubscribe from their contacts

[prosody.git] / plugins / mod_admin_telnet.lua

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 52e9823e243707e2a305ae9dd7d9882972284698..2f7bb57e1a592cc89d9c8d3a174e5c263a0da458 100644 (file)
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -8,18 +8,19 @@
 
 module:set_global();
 
+local hostmanager = require "core.hostmanager";
+local modulemanager = require "core.modulemanager";
+local s2smanager = require "core.s2smanager";
+local portmanager = require "core.portmanager";
+
 local _G = _G;
 
 local prosody = _G.prosody;
 local hosts = prosody.hosts;
+local incoming_s2s = prosody.incoming_s2s;
 
 local console_listener = { default_port = 5582; default_mode = "*a"; interface = "127.0.0.1" };
 
-local hostmanager = require "core.hostmanager";
-local modulemanager = require "core.modulemanager";
-local s2smanager = require "core.s2smanager";
-local portmanager = require "core.portmanager";
-
 local iterators = require "util.iterators";
 local keys, values = iterators.keys, iterators.values;
 local jid = require "util.jid";
@@ -519,7 +520,7 @@ function def_env.c2s:show_secure(match_jid)
 end
 
 function def_env.c2s:close(match_jid)
-       local print, count = self.session.print, 0;
+       local count = 0;
        show_c2s(function (jid, session)
                if jid == match_jid or jid_bare(jid) == match_jid then
                        count = count + 1;
@@ -875,7 +876,7 @@ function def_env.port:close(close_port, close_interface)
                                        self.session.print("Closing ["..interface.."]:"..close_port.."...");
                                        local ok, err = portmanager.close(interface, close_port)
                                        if not ok then
-                                               self.session.print("Failed to close "..interface.." "..port..": "..err);
+                                               self.session.print("Failed to close "..interface.." "..close_port..": "..err);
                                        else
                                                n_closed = n_closed + 1;
                                        end