prosody
783107f85ea0
plugins/muc/mod_muc.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

plugins/muc/mod_muc.lua @ 5940:783107f85ea0

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 13 Dec 2013 12:53:14 +0000
parent 5939:56d81af64fc5
child 5941:31f14991070b
comparison
equal deleted inserted replaced
5936:97b891475cd6 5940:783107f85ea0
162 if stanza.name ~= "presence" then 162 if stanza.name ~= "presence" then
163 origin.send(st.error_reply(stanza, "cancel", "item-not-found")); 163 origin.send(st.error_reply(stanza, "cancel", "item-not-found"));
164 return true; 164 return true;
165 end 165 end
166 if not(restrict_room_creation) or 166 if not(restrict_room_creation) or
167 (restrict_room_creation == "admin" and is_admin(stanza.attr.from)) or 167 is_admin(stanza.attr.from)) or
168 (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then 168 (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then
169 room = create_room(bare); 169 room = create_room(bare);
170 end 170 end
171 end 171 end
172 if room then 172 if room then