Software /
code /
prosody
Comparison
plugins/muc/mod_muc.lua @ 5939:56d81af64fc5
Merge 0.9->0.10
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Fri, 13 Dec 2013 12:52:39 +0000 |
parent | 5808:026367992a0f |
parent | 5938:deb261fb5c04 |
child | 5941:31f14991070b |
comparison
equal
deleted
inserted
replaced
5935:a367bae38385 | 5939:56d81af64fc5 |
---|---|
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 |