Mercurial > prosody-modules
comparison mod_conversejs/mod_conversejs.lua @ 3310:908b2bc05d26
mod_conversejs: Restore accidentally removed configuration option handling
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 09 Sep 2018 14:43:23 +0200 |
| parents | c34f9fd632a6 |
| children | e714be00aaad |
comparison
equal
deleted
inserted
replaced
| 3309:c34f9fd632a6 | 3310:908b2bc05d26 |
|---|---|
| 57 domain_placeholder = module.host; | 57 domain_placeholder = module.host; |
| 58 allow_registration = allow_registration; | 58 allow_registration = allow_registration; |
| 59 registration_domain = allow_registration and module.host or nil; | 59 registration_domain = allow_registration and module.host or nil; |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 if type(more_options) == "table" then | |
| 63 for k,v in pairs(more_options) do | |
| 64 converse_options[k] = v; | |
| 65 end | |
| 66 end | |
| 67 | |
| 62 event.response.headers.content_type = "text/html"; | 68 event.response.headers.content_type = "text/html"; |
| 63 return template:format(json_encode(converse_options)); | 69 return template:format(json_encode(converse_options)); |
| 64 end; | 70 end; |
| 65 } | 71 } |
| 66 }); | 72 }); |
