X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmuc%2Fmod_muc.lua;h=329b927022f7ca33e4916c5a0acdbe92492fe576;hb=9e237b2b10201b73e512ae3a4e9129a8019592fc;hp=a9d9336ca0cf24719297c47663fc3fd754f1582f;hpb=f3a7661d38767e5e8fdaaf96b470aecf55a08f8f;p=prosody.git

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index a9d9336c..329b9270 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -15,11 +15,14 @@ local muc_host = module:get_host();
 local muc_name = module:get_option("name");
 if type(muc_name) ~= "string" then muc_name = "Prosody Chatrooms"; end
 local restrict_room_creation = module:get_option("restrict_room_creation");
-if restrict_room_creation and restrict_room_creation ~= true then restrict_room_creation = nil; end
-
+if restrict_room_creation then
+	if restrict_room_creation == true then 
+		restrict_room_creation = "admin";
+	elseif restrict_room_creation ~= "admin" and restrict_room_creation ~= "local" then
+		restrict_room_creation = nil;
+	end
+end
 local muc_new_room = module:require "muc".new_room;
-local register_component = require "core.componentmanager".register_component;
-local deregister_component = require "core.componentmanager".deregister_component;
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
@@ -27,9 +30,10 @@ local uuid_gen = require "util.uuid".generate;
 local datamanager = require "util.datamanager";
 local um_is_admin = require "core.usermanager".is_admin;
 
-local rooms = {};
+rooms = {};
+local rooms = rooms;
 local persistent_rooms = datamanager.load(nil, muc_host, "persistent") or {};
-local component;
+local component = hosts[module.host];
 
 -- Configurable options
 local max_history_messages = module:get_option_number("max_history_messages");
@@ -87,7 +91,7 @@ local function get_disco_items(stanza)
 	local reply = st.iq({type='result', id=stanza.attr.id, from=muc_host, to=stanza.attr.from}):query("http://jabber.org/protocol/disco#items");
 	for jid, room in pairs(rooms) do
 		if not room:is_hidden() then
-			reply:tag("item", {jid=jid, name=jid}):up();
+			reply:tag("item", {jid=jid, name=room:get_name()}):up();
 		end
 	end
 	return reply; -- TODO cache disco reply
@@ -113,14 +117,17 @@ local function handle_to_domain(origin, stanza)
 	end
 end
 
-component = register_component(muc_host, function(origin, stanza)
+function stanza_handler(event)
+	local origin, stanza = event.origin, event.stanza;
 	local to_node, to_host, to_resource = jid_split(stanza.attr.to);
 	if to_node then
 		local bare = to_node.."@"..to_host;
 		if to_host == muc_host or bare == muc_host then
 			local room = rooms[bare];
 			if not room then
-				if not(restrict_room_creation) or is_admin(stanza.attr.from) then
+				if not(restrict_room_creation) or
+				  (restrict_room_creation == "admin" and is_admin(stanza.attr.from)) or
+				  (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then
 					room = muc_new_room(bare, {
 						history_length = max_history_messages;
 					});
@@ -138,12 +145,23 @@ component = register_component(muc_host, function(origin, stanza)
 				origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
 			end
 		else --[[not for us?]] end
-		return;
+		return true;
 	end
 	-- to the main muc domain
 	handle_to_domain(origin, stanza);
-end);
-function component.send(stanza) -- FIXME do a generic fix
+	return true;
+end
+module:hook("iq/bare", stanza_handler, -1);
+module:hook("message/bare", stanza_handler, -1);
+module:hook("presence/bare", stanza_handler, -1);
+module:hook("iq/full", stanza_handler, -1);
+module:hook("message/full", stanza_handler, -1);
+module:hook("presence/full", stanza_handler, -1);
+module:hook("iq/host", stanza_handler, -1);
+module:hook("message/host", stanza_handler, -1);
+module:hook("presence/host", stanza_handler, -1);
+
+hosts[module.host].send = function(stanza) -- FIXME do a generic fix
 	if stanza.attr.type == "result" or stanza.attr.type == "error" then
 		core_post_stanza(component, stanza);
 	else error("component.send only supports result and error stanzas at the moment"); end
@@ -151,14 +169,10 @@ end
 
 prosody.hosts[module:get_host()].muc = { rooms = rooms };
 
-module.unload = function()
-	deregister_component(muc_host);
-end
 module.save = function()
 	return {rooms = rooms};
 end
 module.restore = function(data)
-	rooms = {};
 	for jid, oldroom in pairs(data.rooms or {}) do
 		local room = muc_new_room(jid);
 		room._jid_nick = oldroom._jid_nick;