Comparison

mod_admin_telnet: user:list(): Allow filtering the set of users

comparison

equal deleted inserted replaced

-:ecd9e300ec94
+:46fc0eff10b4
 		print [[host:list() - List the currently-activated hosts]]
 	elseif section == "user" then
 		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]]
 		print [[server:shutdown(reason) - Shut down the server, with an optional reason to be broadcast to all connections]]
 	elseif section == "config" then
 	else
 		return nil, "Could not change password for user: "..err;
 	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
-	end
+			print(user.."@"..host);
-	return true;
+		end
+		count = count + 1;
+	end
+	return true, count .. " users total";
 end
 def_env.xmpp = {};
 local st = require "util.stanza";