X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmuc%2Fmod_muc.lua;h=c0945daa980ec2ec7e2cddfb976b0d5a7c9f9b9d;hb=8c3813febf0790ca6bff772544fd56dbf4b2cab1;hp=602de0f4fed1d4da3d2b0fe0041af8d12318bda8;hpb=f26468bf8cf473aced38d2b4164a33893140b7c6;p=prosody.git

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 602de0f4..c0945daa 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -14,20 +14,27 @@ end
 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 history_length = 20;
+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
 
 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";
 local uuid_gen = require "util.uuid".generate;
 local datamanager = require "util.datamanager";
+local um_is_admin = require "core.usermanager".is_admin;
 
 local rooms = {};
 local persistent_rooms = datamanager.load(nil, muc_host, "persistent") or {};
 local component;
 
+local function is_admin(jid)
+	return um_is_admin(jid) or um_is_admin(jid, module.host);
+end
+
 local function room_route_stanza(room, stanza) core_post_stanza(component, stanza); end
 local function room_save(room, forced)
 	local node = jid_split(room.jid);
@@ -71,7 +78,7 @@ end
 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._data.hidden then
+		if not room:is_hidden() then
 			reply:tag("item", {jid=jid, name=jid}):up();
 		end
 	end
@@ -105,14 +112,20 @@ component = register_component(muc_host, function(origin, stanza)
 		if to_host == muc_host or bare == muc_host then
 			local room = rooms[bare];
 			if not room then
-				room = muc_new_room(bare);
-				room.route_stanza = room_route_stanza;
-				room.save = room_save;
-				rooms[bare] = room;
+				if not(restrict_room_creation) or is_admin(stanza.attr.from) then
+					room = muc_new_room(bare);
+					room.route_stanza = room_route_stanza;
+					room.save = room_save;
+					rooms[bare] = room;
+				end
 			end
-			room:handle_stanza(origin, stanza);
-			if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room
-				rooms[bare] = nil; -- discard room
+			if room then
+				room:handle_stanza(origin, stanza);
+				if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room
+					rooms[bare] = nil; -- discard room
+				end
+			else
+				origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
 			end
 		else --[[not for us?]] end
 		return;