aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_admin_telnet.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-10-14 22:53:41 +0200
committerKim Alvefur <zash@zash.se>2012-10-14 22:53:41 +0200
commit07d035d93ce4bb8f9fa19840653654688e3eec8f (patch)
tree0fcfafb96064def71df05ea9765e4141bfc89a1c /plugins/mod_admin_telnet.lua
parent575e1581d8280a9b966cc48fa6280125e03f154e (diff)
parent6da5020684d3f7b8ea69afb0c65ea3d8b46f137a (diff)
downloadprosody-07d035d93ce4bb8f9fa19840653654688e3eec8f.tar.gz
prosody-07d035d93ce4bb8f9fa19840653654688e3eec8f.zip
Merge 0.9 -> trunk
Diffstat (limited to 'plugins/mod_admin_telnet.lua')
-rw-r--r--plugins/mod_admin_telnet.lua14
1 files changed, 10 insertions, 4 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 9d3186d6..e9d595ba 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -228,7 +228,7 @@ function commands.help(session, data)
print [[user:create(jid, password) - Create the specified user account]]
print [[user:password(jid, password) - Set the password for the specified user account]]
print [[user:delete(jid) - Permanently remove the specified user account]]
- print [[user:list(hostname) - List users on the specified host]]
+ print [[user:list(hostname, pattern) - List users on the specified host, optionally filtering with a pattern]]
elseif section == "server" then
print [[server:version() - Show the server's version number]]
print [[server:uptime() - Show how long the server has been running]]
@@ -953,15 +953,21 @@ function def_env.user:password(jid, password)
end
end
-function def_env.user:list(host)
+function def_env.user:list(host, pat)
if not host then
return nil, "No host given";
+ elseif not hosts[host] then
+ return nil, "No such host";
end
local print = self.session.print;
+ local count = 0;
for user in um.users(host) do
- print(user.."@"..host);
+ if not pat or user:match(pat) then
+ print(user.."@"..host);
+ end
+ count = count + 1;
end
- return true;
+ return true, count .. " users total";
end
def_env.xmpp = {};