annotate mod_admin_web/admin_web/www_files/css/style.css @ 6299:5cf5ee23b361

mod_voipms: New Module to send and receive SMS/MMS via VoIP.ms APIs. diff --git a/mod_voipms/README.md b/mod_voipms/README.md new file mode 100644 --- /dev/null +++ b/mod_voipms/README.md @@ -0,0 +1,51 @@ +--- +labels: +- 'Stage-Alpha' +- 'Type-Web' +summary: Send and receive SMS/MMS via VoIP.ms APIs. +rockspec: + build: + modules: + mod_voipms: mod_voipms.lua +... + +Introduction +============ + +This is a Prosody module to map JIDs to DIDs on VoIP.ms and support sending/receiving SMS/MMS. + +Configuration +============= + +| option | type | default | +|-----------------------|--------|---------| +| voipms\_api\_username | string | nil | +| voipms\_api\_password | string | nil | +| voipms\_query\_key | string | nil | +| voipms\_jid\_map | table | nil | +``` +VirtualHost "sms.example.com" +modules_enabled = { + "voipms"; +} +voipms_api_username = john@example.com -- E-mail registered with VoIP.ms +voipms_api_password = abcd1234 -- API password configured in VoIP.ms +voipms_query_key = some_query_key -- query param 'key' part of your URL callback +voipms_jid_map = { + ["your_jid@your_domain.com"] = "+1234567890" +} +``` + +HTTP +==== + +The module is served on Prosody's default HTTP ports at the path /voipms. More details on configuring HTTP modules in Prosody can be found in the HTTP documentation. + +VoIP.ms Webhook URL +=================== + +This module receives the VoIP.ms Webhook URL (POST) at the /voipms endpoint. It uses the sendSMS/sendMMS GET methods against the VoIP.ms APIs. This is an example webhook to use in VoIP.ms: + +``` +https://sms.example.com/voipms?key=some_query_key +``` diff --git a/mod_voipms/mod_voipms.lua b/mod_voipms/mod_voipms.lua new file mode 100644 --- /dev/null +++ b/mod_voipms/mod_voipms.lua @@ -0,0 +1,166 @@ +local http = require "net.http" +local json = require "util.json" +local st = require "util.stanza" + +local api_username = module:get_option_string("voipms_api_username") +local api_password = module:get_option_string("voipms_api_password") +local query_key = module:get_option("voipms_query_key") +local jid_map = module:get_option("voipms_jid_map") or {} +local rest_endpoint = "https://voip.ms/api/v1/rest.php" + +if not api_username or not api_password or not query_key then + module:log("error", "Missing required config values (voipms_api_username, voipms_api_password, voipms_query_key)") + return +end + +module:depends("http") + +local function normalize_number(num) + if not num then return nil end + if num:sub(1, 1) ~= "+" then + return "+1" .. num + end + return num +end + +local function extract_query_key(event) + return (event.request.url.query or ""):match("key=([^&]+)") +end + +module:provides("http", { + route = { + ["POST"] = function(event) + local req = event.request + local body = req.body or "" + + if extract_query_key(event) ~= query_key then + module:log("warn", "Unauthorized webhook: missing or invalid key") + return { status_code = 403 } + end + + local json_payload, err = json.decode(body) + if not json_payload then + module:log("warn", "Invalid JSON: %s", err or "unknown error") + return { status_code = 400 } + end + + local payload = json_payload.data and json_payload.data.payload + if not payload then + module:log("warn", "Missing payload in JSON") + return { status_code = 400 } + end + + local from = payload.from and payload.from.phone_number + local to_list = payload.to or {} + local to = #to_list > 0 and to_list[1].phone_number or nil + + if not from or not to then + module:log("warn", "Missing phone numbers (from: %s, to: %s)", tostring(from), tostring(to)) + return { status_code = 400 } + end + + local normalized_to = normalize_number(to) + local target_jid = nil + + for jid, did in pairs(jid_map) do + if normalize_number(did) == normalized_to then + target_jid = jid + break + end + end + + if not target_jid then + module:log("warn", "No JID mapping for DID %s", normalized_to) + return { status_code = 404 } + end + + local normalized_from = normalize_number(from) + local message_text = payload.text or "" + + local message = st.message({ + from = normalized_from .. "@" .. module.host, + to = target_jid, + type = "chat" + }):tag("body"):text(message_text):up() + + if payload.media and #payload.media > 0 then + for _, media_item in ipairs(payload.media) do + if media_item.url then + message_text = message_text .. "\n" .. media_item.url + message:tag("x", { xmlns = "jabber:x:oob" }) + :tag("url"):text(media_item.url):up():up() + end + end + end + + module:send(message) + module:log("info", "Delivered SMS from %s to %s", normalized_from, target_jid) + + return { status_code = 204 } + end + } +}) + +module:hook("message/bare", function(event) + local stanza = event.stanza + if stanza.attr.type ~= "chat" then return end + + local from_jid = stanza.attr.from + local to_jid = stanza.attr.to + local body = stanza:get_child_text("body") + if not body or body == "" then return end + + local from_number = jid_map[from_jid] + if not from_number then + module:log("warn", "No DID mapping for JID %s", from_jid) + return + end + + local to_number = to_jid:match("^([^@]+)") + if not to_number then + module:log("warn", "Malformed JID in message.to: %s", to_jid) + return + end + + to_number = normalize_number(to_number) + + local media_urls = {} + for line in body:gmatch("[^\r\n]+") do + if line:match("^https?://") then + table.insert(media_urls, line) + end + end + + local method = (#media_urls > 0) and "sendMMS" or "sendSMS" + local query = { + api_username = api_username, + api_password = api_password, + method = method, + did = from_number, + dst = to_number, + message = body + } + + if method == "sendMMS" then + for i, url in ipairs(media_urls) do + query["media_url[" .. (i - 1) .. "]"] = url + end + end + + local query_str = http.formencode(query) + + http.request(rest_endpoint .. "?" .. query_str, { + method = "GET"; + }, function(response_body, code) + if code == 200 then + local resp, err = json.decode(response_body) + if not resp or resp.status ~= "success" then + module:log("error", "Failed to send %s: %s", method, err or (resp and resp.status) or "unknown") + else + module:log("info", "Sent %s from %s to %s", method, from_number, to_number) + end + else + module:log("error", "HTTP error sending %s: code %s", method, tostring(code)) + end + end) +end)
author Chaz <menel@snikket.de>
date Mon, 21 Jul 2025 23:57:37 +0200
parents f53475ee7ff4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
288
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
1 body {
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
2 margin: 0
288
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
3 }
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
4
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
5 a {
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
6 color: #0000FF
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
7 }
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
8
1117
d643c385d3f6 mod_admin_web: Provide some information about the TLS layer
Florian Zeitz <florob@babelmonkeys.de>
parents: 1022
diff changeset
9 #adhocCommands > ul {
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
10 margin: 0
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
11 }
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
12
575
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
13 .btn {
577
d26436bdfd5c mod_admin_web: Fix margins
Florian Zeitz <florob@babelmonkeys.de>
parents: 575
diff changeset
14 margin-right: 0.3em
575
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
15 }
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
16
1022
f15c25fff9cc mod_admin_web: Fix CSS, :last -> :last-child
Florian Zeitz <florob@babelmonkeys.de>
parents: 1002
diff changeset
17 .btn:last-child {
577
d26436bdfd5c mod_admin_web: Fix margins
Florian Zeitz <florob@babelmonkeys.de>
parents: 575
diff changeset
18 margin-right: 0
575
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
19 }
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
20
288
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
21 #log_container {
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
22 clear: both;
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
23 display: none
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
24 }
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
25
573
c9955858dc7e mod_adhoc_web: Redesign adhoc command pane
Florian Zeitz <florob@babelmonkeys.de>
parents: 539
diff changeset
26 #adhocCommands {
c9955858dc7e mod_adhoc_web: Redesign adhoc command pane
Florian Zeitz <florob@babelmonkeys.de>
parents: 539
diff changeset
27 border-right: solid 1px
c9955858dc7e mod_adhoc_web: Redesign adhoc command pane
Florian Zeitz <florob@babelmonkeys.de>
parents: 539
diff changeset
28 }
c9955858dc7e mod_adhoc_web: Redesign adhoc command pane
Florian Zeitz <florob@babelmonkeys.de>
parents: 539
diff changeset
29
c9955858dc7e mod_adhoc_web: Redesign adhoc command pane
Florian Zeitz <florob@babelmonkeys.de>
parents: 539
diff changeset
30 #adhocCommands li {
c9955858dc7e mod_adhoc_web: Redesign adhoc command pane
Florian Zeitz <florob@babelmonkeys.de>
parents: 539
diff changeset
31 list-style: inside
288
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
32 }
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
33
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
34 #login {
288
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
35 float: left;
575
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
36 margin: 1em 2em 0 1em;
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
37 padding-right: 1em;
319
ba2e78661ea8 mod_admin_web: Make module global. Host to administrate is now chooseable
Florian Zeitz <florob@babelmonkeys.de>
parents: 301
diff changeset
38 border: solid 1px;
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
39 background: #eef0f2;
288
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
40 color: #000000
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
41 }
9233d7ee3c09 mod_admin_web: Initial PoC commit
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
42
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
43 #main {
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
44 display: none;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
45 margin: 1em
319
ba2e78661ea8 mod_admin_web: Make module global. Host to administrate is now chooseable
Florian Zeitz <florob@babelmonkeys.de>
parents: 301
diff changeset
46 }
ba2e78661ea8 mod_admin_web: Make module global. Host to administrate is now chooseable
Florian Zeitz <florob@babelmonkeys.de>
parents: 301
diff changeset
47
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
48 #main p {
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
49 margin: 0
294
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
50 }
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
51
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
52 #top {
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
53 clear: both;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
54 width: 100%;
573
c9955858dc7e mod_adhoc_web: Redesign adhoc command pane
Florian Zeitz <florob@babelmonkeys.de>
parents: 539
diff changeset
55 padding: 0;
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
56 }
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
57
1219
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
58 @media screen and (min-width: 757px) {
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
59 #header {
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
60 background: url(../images/blue_orange.png) repeat-x
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
61 }
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
62 }
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
63
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
64 #header img {
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
65 max-width: 100%;
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
66 height: auto
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
67 }
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
68
294
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
69 #menu {
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
70 display: none;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
71 color: #454748;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
72 font-size: 1.1em;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
73 background: #eef0f2;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
74 width: 100%;
294
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
75 }
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
76
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
77 #menu ul {
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
78 display: inline;
294
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
79 list-style-type: none;
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
80 margin: 0;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
81 padding: 0.5em 0
294
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
82 }
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
83
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
84 #menu li {
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
85 display: inline;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
86 padding: 0 0.5em
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
87 }
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
88
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
89 #menu a {
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
90 color: #454748;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
91 text-decoration: none
294
5a619d6045a8 mod_admin_web: Prepare for adding more features
Florian Zeitz <florob@babelmonkeys.de>
parents: 288
diff changeset
92 }
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
93
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
94 #menu li a:hover {
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
95 color: #6197DF;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
96 text-decoration: underline
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
97 }
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
98
1219
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
99 #selector {
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
100 display: inline-block
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
101 }
f53475ee7ff4 mod_admin_web: Some style fixes
Florian Zeitz <florob@babelmonkeys.de>
parents: 1119
diff changeset
102
539
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
103 #s2sList h2, #c2sList h2 {
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
104 color: #4b8ade;
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
105 margin: 0
99465bbfa205 First pass of web-admin redesign
Florian Zeitz <florob@babelmonkeys.de>
parents: 334
diff changeset
106 }
575
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
107
1119
1af68e5e40f3 mod_admin_web: Use a different cursor for expandable items
Florian Zeitz <florob@babelmonkeys.de>
parents: 1117
diff changeset
108 #s2sList li, #c2sList li {
1af68e5e40f3 mod_admin_web: Use a different cursor for expandable items
Florian Zeitz <florob@babelmonkeys.de>
parents: 1117
diff changeset
109 cursor: pointer
1af68e5e40f3 mod_admin_web: Use a different cursor for expandable items
Florian Zeitz <florob@babelmonkeys.de>
parents: 1117
diff changeset
110 }
1af68e5e40f3 mod_admin_web: Use a different cursor for expandable items
Florian Zeitz <florob@babelmonkeys.de>
parents: 1117
diff changeset
111
575
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
112 #host {
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
113 margin: 0.25em;
565d5409c6ca Adapt to bootstrap
Florian Zeitz <florob@babelmonkeys.de>
parents: 573
diff changeset
114 }