# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1335037192 -3600
# Node ID e0bd8587f2fb86bcafa15b23c290598223c51833
# Parent  4539e99be74330efe40b4dab5709b4484c605ea7
mod_admin_telnet: module:list(): List global modules (part-fixes #228)

diff -r 4539e99be743 -r e0bd8587f2fb plugins/mod_admin_telnet.lua
--- a/plugins/mod_admin_telnet.lua	Sat Apr 21 20:39:21 2012 +0100
+++ b/plugins/mod_admin_telnet.lua	Sat Apr 21 20:39:52 2012 +0100
@@ -363,6 +363,7 @@
 function def_env.module:list(hosts)
 	if hosts == nil then
 		hosts = array.collect(keys(prosody.hosts));
+		table.insert(hosts, 1, "*");
 	end
 	if type(hosts) == "string" then
 		hosts = { hosts };
@@ -373,8 +374,8 @@
 	
 	local print = self.session.print;
 	for _, host in ipairs(hosts) do
-		print(host..":");
-		local modules = array.collect(keys(prosody.hosts[host] and prosody.hosts[host].modules or {})):sort();
+		print((host == "*" and "Global" or host)..":");
+		local modules = array.collect(keys(modulemanager.get_modules(host) or {})):sort();
 		if #modules == 0 then
 			if prosody.hosts[host] then
 				print("    No modules loaded");