Mercurial > prosody-hg
comparison plugins/muc/mod_muc.lua @ 5946:04f2138dfa87
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 16 Dec 2013 02:04:43 +0000 |
| parents | 51ead0aa3a02 |
| children | c68e2b11d691 |
comparison
equal
deleted
inserted
replaced
| 5940:783107f85ea0 | 5946:04f2138dfa87 |
|---|---|
| 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 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 |
