Software /
code /
prosody-modules
Annotate
mod_carbons/mod_carbons.lua @ 1345:c60e9943dcb9
Fix problem handling form input
author | Luis G.F <luisgf@gmail.com> |
---|---|
date | Thu, 13 Mar 2014 14:58:47 +0000 |
parent | 1343:7dbde05b48a9 |
child | 1789:dbce8a7726ef |
rev | line source |
---|---|
521
6d0d2673f95e
mod_carbons: Add MIT license statement.
Kim Alvefur <zash@zash.se>
parents:
520
diff
changeset
|
1 -- XEP-0280: Message Carbons implementation for Prosody |
6d0d2673f95e
mod_carbons: Add MIT license statement.
Kim Alvefur <zash@zash.se>
parents:
520
diff
changeset
|
2 -- Copyright (C) 2011 Kim Alvefur |
6d0d2673f95e
mod_carbons: Add MIT license statement.
Kim Alvefur <zash@zash.se>
parents:
520
diff
changeset
|
3 -- |
6d0d2673f95e
mod_carbons: Add MIT license statement.
Kim Alvefur <zash@zash.se>
parents:
520
diff
changeset
|
4 -- This file is MIT/X11 licensed. |
6d0d2673f95e
mod_carbons: Add MIT license statement.
Kim Alvefur <zash@zash.se>
parents:
520
diff
changeset
|
5 |
462 | 6 local st = require "util.stanza"; |
7 local jid_bare = require "util.jid".bare; | |
850
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
8 local xmlns_carbons = "urn:xmpp:carbons:2"; |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
9 local xmlns_carbons_old = "urn:xmpp:carbons:1"; |
884
2ece37bf9cc6
mod_carbons: Support the pre-forwarding version of Carbons. Please don't implement this.
Kim Alvefur <zash@zash.se>
parents:
854
diff
changeset
|
10 local xmlns_carbons_really_old = "urn:xmpp:carbons:0"; |
462 | 11 local xmlns_forward = "urn:xmpp:forward:0"; |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
12 local full_sessions, bare_sessions = full_sessions, bare_sessions; |
462 | 13 |
804
9927d88a1b2a
mod_carbons: Merge enable and disable handlers
Kim Alvefur <zash@zash.se>
parents:
743
diff
changeset
|
14 local function toggle_carbons(event) |
462 | 15 local origin, stanza = event.origin, event.stanza; |
1184
0d3d15586d7e
mod_carbons: Use iq-type events
Kim Alvefur <zash@zash.se>
parents:
1183
diff
changeset
|
16 local state = stanza.tags[1].attr.mode or stanza.tags[1].name; |
0d3d15586d7e
mod_carbons: Use iq-type events
Kim Alvefur <zash@zash.se>
parents:
1183
diff
changeset
|
17 module:log("debug", "%s %sd carbons", origin.full_jid, state); |
0d3d15586d7e
mod_carbons: Use iq-type events
Kim Alvefur <zash@zash.se>
parents:
1183
diff
changeset
|
18 origin.want_carbons = state == "enable" and stanza.tags[1].attr.xmlns; |
0d3d15586d7e
mod_carbons: Use iq-type events
Kim Alvefur <zash@zash.se>
parents:
1183
diff
changeset
|
19 return origin.send(st.reply(stanza)); |
804
9927d88a1b2a
mod_carbons: Merge enable and disable handlers
Kim Alvefur <zash@zash.se>
parents:
743
diff
changeset
|
20 end |
1184
0d3d15586d7e
mod_carbons: Use iq-type events
Kim Alvefur <zash@zash.se>
parents:
1183
diff
changeset
|
21 module:hook("iq-set/self/"..xmlns_carbons..":disable", toggle_carbons); |
0d3d15586d7e
mod_carbons: Use iq-type events
Kim Alvefur <zash@zash.se>
parents:
1183
diff
changeset
|
22 module:hook("iq-set/self/"..xmlns_carbons..":enable", toggle_carbons); |
462 | 23 |
850
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
24 -- COMPAT |
1184
0d3d15586d7e
mod_carbons: Use iq-type events
Kim Alvefur <zash@zash.se>
parents:
1183
diff
changeset
|
25 module:hook("iq-set/self/"..xmlns_carbons_old..":disable", toggle_carbons); |
0d3d15586d7e
mod_carbons: Use iq-type events
Kim Alvefur <zash@zash.se>
parents:
1183
diff
changeset
|
26 module:hook("iq-set/self/"..xmlns_carbons_old..":enable", toggle_carbons); |
0d3d15586d7e
mod_carbons: Use iq-type events
Kim Alvefur <zash@zash.se>
parents:
1183
diff
changeset
|
27 module:hook("iq-set/self/"..xmlns_carbons_really_old..":carbons", toggle_carbons); |
884
2ece37bf9cc6
mod_carbons: Support the pre-forwarding version of Carbons. Please don't implement this.
Kim Alvefur <zash@zash.se>
parents:
854
diff
changeset
|
28 |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
29 local function message_handler(event, c2s) |
462 | 30 local origin, stanza = event.origin, event.stanza; |
31 local orig_type = stanza.attr.type; | |
835
07cc1efde2f8
mod_carbons: Fix handling of messages from remote hosts
Kim Alvefur <zash@zash.se>
parents:
833
diff
changeset
|
32 local orig_from = stanza.attr.from; |
462 | 33 local orig_to = stanza.attr.to; |
1343
7dbde05b48a9
all the things: Remove trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
1325
diff
changeset
|
34 |
462 | 35 if not (orig_type == nil |
36 or orig_type == "normal" | |
37 or orig_type == "chat") then | |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
38 return -- No carbons for messages of type error or headline |
462 | 39 end |
40 | |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
41 -- Stanza sent by a local client |
836
a86131581180
mod_carbons: Less complicated assignments (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
835
diff
changeset
|
42 local bare_jid = jid_bare(orig_from); |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
43 local target_session = origin; |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
44 local top_priority = false; |
836
a86131581180
mod_carbons: Less complicated assignments (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
835
diff
changeset
|
45 local user_sessions = bare_sessions[bare_jid]; |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
46 |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
47 -- Stanza about to be delivered to a local client |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
48 if not c2s then |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
49 bare_jid = jid_bare(orig_to); |
836
a86131581180
mod_carbons: Less complicated assignments (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
835
diff
changeset
|
50 target_session = full_sessions[orig_to]; |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
51 user_sessions = bare_sessions[bare_jid]; |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
52 if not target_session and user_sessions then |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
53 -- The top resources will already receive this message per normal routing rules, |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
54 -- so we are going to skip them in order to avoid sending duplicated messages. |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
55 local top_resources = user_sessions.top_resources; |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
56 top_priority = top_resources and top_resources[1].priority |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
57 end |
462 | 58 end |
59 | |
585
ce2798a1bc56
mod_carbons: Don't try to send carbons for entirely offline users.
Kim Alvefur <zash@zash.se>
parents:
545
diff
changeset
|
60 if not user_sessions then |
605
5175f6d33470
mod_carbons: Add more debug logging
Kim Alvefur <zash@zash.se>
parents:
585
diff
changeset
|
61 module:log("debug", "Skip carbons for offline user"); |
585
ce2798a1bc56
mod_carbons: Don't try to send carbons for entirely offline users.
Kim Alvefur <zash@zash.se>
parents:
545
diff
changeset
|
62 return -- No use in sending carbons to an offline user |
ce2798a1bc56
mod_carbons: Don't try to send carbons for entirely offline users.
Kim Alvefur <zash@zash.se>
parents:
545
diff
changeset
|
63 end |
ce2798a1bc56
mod_carbons: Don't try to send carbons for entirely offline users.
Kim Alvefur <zash@zash.se>
parents:
545
diff
changeset
|
64 |
1325
b21236b6b8d8
Backed out changeset 853a382c9bd6
Kim Alvefur <zash@zash.se>
parents:
1324
diff
changeset
|
65 if stanza:get_child("private", xmlns_carbons) then |
1317
35c57db6877f
mod_carbons: Ignore messages tagged as private in both directions (thanks hoedlmoser)
Kim Alvefur <zash@zash.se>
parents:
1316
diff
changeset
|
66 if not c2s then |
35c57db6877f
mod_carbons: Ignore messages tagged as private in both directions (thanks hoedlmoser)
Kim Alvefur <zash@zash.se>
parents:
1316
diff
changeset
|
67 stanza:maptags(function(tag) |
1325
b21236b6b8d8
Backed out changeset 853a382c9bd6
Kim Alvefur <zash@zash.se>
parents:
1324
diff
changeset
|
68 if not ( tag.attr.xmlns == xmlns_carbons and tag.name == "private" ) then |
1317
35c57db6877f
mod_carbons: Ignore messages tagged as private in both directions (thanks hoedlmoser)
Kim Alvefur <zash@zash.se>
parents:
1316
diff
changeset
|
69 return tag; |
35c57db6877f
mod_carbons: Ignore messages tagged as private in both directions (thanks hoedlmoser)
Kim Alvefur <zash@zash.se>
parents:
1316
diff
changeset
|
70 end |
35c57db6877f
mod_carbons: Ignore messages tagged as private in both directions (thanks hoedlmoser)
Kim Alvefur <zash@zash.se>
parents:
1316
diff
changeset
|
71 end); |
35c57db6877f
mod_carbons: Ignore messages tagged as private in both directions (thanks hoedlmoser)
Kim Alvefur <zash@zash.se>
parents:
1316
diff
changeset
|
72 end |
605
5175f6d33470
mod_carbons: Add more debug logging
Kim Alvefur <zash@zash.se>
parents:
585
diff
changeset
|
73 module:log("debug", "Message tagged private, ignoring"); |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
74 return |
1151
28d4b58bcc3b
mod_carbons: Add support for XEP-0334: Message Processing Hints
Kim Alvefur <zash@zash.se>
parents:
900
diff
changeset
|
75 elseif stanza:get_child("no-copy", "urn:xmpp:hints") then |
28d4b58bcc3b
mod_carbons: Add support for XEP-0334: Message Processing Hints
Kim Alvefur <zash@zash.se>
parents:
900
diff
changeset
|
76 module:log("debug", "Message has no-copy hint, ignoring"); |
28d4b58bcc3b
mod_carbons: Add support for XEP-0334: Message Processing Hints
Kim Alvefur <zash@zash.se>
parents:
900
diff
changeset
|
77 return |
1316
d3e75f6dde9b
mod_carbons: Ignore MUC PMs if tagged as such
Kim Alvefur <zash@zash.se>
parents:
1184
diff
changeset
|
78 elseif stanza:get_child("x", "http://jabber.org/protocol/muc#user") then |
d3e75f6dde9b
mod_carbons: Ignore MUC PMs if tagged as such
Kim Alvefur <zash@zash.se>
parents:
1184
diff
changeset
|
79 module:log("debug", "MUC PM, ignoring"); |
d3e75f6dde9b
mod_carbons: Ignore MUC PMs if tagged as such
Kim Alvefur <zash@zash.se>
parents:
1184
diff
changeset
|
80 return |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
81 end |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
82 |
832
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
83 -- Create the carbon copy and wrap it as per the Stanza Forwarding XEP |
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
84 local copy = st.clone(stanza); |
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
85 copy.attr.xmlns = "jabber:client"; |
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
86 local carbon = st.message{ from = bare_jid, type = orig_type, } |
896
d24d87ca3f5f
mod_carbons: <forwarded/> should be nested in <sent/>/<received/>
Florian Zeitz <florob@babelmonkeys.de>
parents:
888
diff
changeset
|
87 :tag(c2s and "sent" or "received", { xmlns = xmlns_carbons }) |
664
2f11d2473afd
mod_carbons: Move creation of the carbon stanza out of the loop.
Kim Alvefur <zash@zash.se>
parents:
618
diff
changeset
|
88 :tag("forwarded", { xmlns = xmlns_forward }) |
832
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
89 :add_child(copy):reset(); |
664
2f11d2473afd
mod_carbons: Move creation of the carbon stanza out of the loop.
Kim Alvefur <zash@zash.se>
parents:
618
diff
changeset
|
90 |
850
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
91 -- COMPAT |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
92 local carbon_old = st.message{ from = bare_jid, type = orig_type, } |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
93 :tag(c2s and "sent" or "received", { xmlns = xmlns_carbons_old }):up() |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
94 :tag("forwarded", { xmlns = xmlns_forward }) |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
95 :add_child(copy):reset(); |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
96 |
884
2ece37bf9cc6
mod_carbons: Support the pre-forwarding version of Carbons. Please don't implement this.
Kim Alvefur <zash@zash.se>
parents:
854
diff
changeset
|
97 -- COMPAT |
2ece37bf9cc6
mod_carbons: Support the pre-forwarding version of Carbons. Please don't implement this.
Kim Alvefur <zash@zash.se>
parents:
854
diff
changeset
|
98 local carbon_really_old = st.clone(stanza) |
2ece37bf9cc6
mod_carbons: Support the pre-forwarding version of Carbons. Please don't implement this.
Kim Alvefur <zash@zash.se>
parents:
854
diff
changeset
|
99 :tag(c2s and "sent" or "received", { xmlns = xmlns_carbons_really_old }):up() |
2ece37bf9cc6
mod_carbons: Support the pre-forwarding version of Carbons. Please don't implement this.
Kim Alvefur <zash@zash.se>
parents:
854
diff
changeset
|
100 |
618
267548522810
mod_carbons: Remove useless protection against loop that can't happen
Kim Alvefur <zash@zash.se>
parents:
617
diff
changeset
|
101 user_sessions = user_sessions and user_sessions.sessions; |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
102 for _, session in pairs(user_sessions) do |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
103 -- Carbons are sent to resources that have enabled it |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
104 if session.want_carbons |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
105 -- but not the resource that sent the message, or the one that it's directed to |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
106 and session ~= target_session |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
107 -- and isn't among the top resources that would receive the message per standard routing rules |
888
f8d08f8ed7de
mod_carbons: Make support for v0 disabled by default, don't send v0 carbons for c2s
Michael Holzt <kju@fqdn.org>
parents:
884
diff
changeset
|
108 and (c2s or session.priority ~= top_priority) |
f8d08f8ed7de
mod_carbons: Make support for v0 disabled by default, don't send v0 carbons for c2s
Michael Holzt <kju@fqdn.org>
parents:
884
diff
changeset
|
109 -- don't send v0 carbons (or copies) for c2s |
f8d08f8ed7de
mod_carbons: Make support for v0 disabled by default, don't send v0 carbons for c2s
Michael Holzt <kju@fqdn.org>
parents:
884
diff
changeset
|
110 and (not c2s or session.want_carbons ~= xmlns_carbons_really_old) then |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
111 carbon.attr.to = session.full_jid; |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
112 module:log("debug", "Sending carbon to %s", session.full_jid); |
884
2ece37bf9cc6
mod_carbons: Support the pre-forwarding version of Carbons. Please don't implement this.
Kim Alvefur <zash@zash.se>
parents:
854
diff
changeset
|
113 local carbon = session.want_carbons == xmlns_carbons_old and carbon_old -- COMPAT |
2ece37bf9cc6
mod_carbons: Support the pre-forwarding version of Carbons. Please don't implement this.
Kim Alvefur <zash@zash.se>
parents:
854
diff
changeset
|
114 or session.want_carbons == xmlns_carbons_really_old and carbon_really_old -- COMPAT |
2ece37bf9cc6
mod_carbons: Support the pre-forwarding version of Carbons. Please don't implement this.
Kim Alvefur <zash@zash.se>
parents:
854
diff
changeset
|
115 or carbon; |
832
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
116 session.send(carbon); |
462 | 117 end |
118 end | |
119 end | |
120 | |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
121 local function c2s_message_handler(event) |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
122 return message_handler(event, true) |
462 | 123 end |
124 | |
125 -- Stanzas sent by local clients | |
900
aca1c5eb0508
mod_carbons: Catch outgoing messages to hosts (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
896
diff
changeset
|
126 module:hook("pre-message/host", c2s_message_handler, 1); |
462 | 127 module:hook("pre-message/bare", c2s_message_handler, 1); |
128 module:hook("pre-message/full", c2s_message_handler, 1); | |
510
59e80326f2b3
mod_carbons: Fix a typo and unindent a line.
Kim Alvefur <zash@zash.se>
parents:
480
diff
changeset
|
129 -- Stanzas to local clients |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
130 module:hook("message/bare", message_handler, 1); |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
131 module:hook("message/full", message_handler, 1); |
462 | 132 |
133 module:add_feature(xmlns_carbons); | |
854
1c64ab8ae374
mod_carbons: Advertise support for the previous version
Kim Alvefur <zash@zash.se>
parents:
850
diff
changeset
|
134 module:add_feature(xmlns_carbons_old); |
888
f8d08f8ed7de
mod_carbons: Make support for v0 disabled by default, don't send v0 carbons for c2s
Michael Holzt <kju@fqdn.org>
parents:
884
diff
changeset
|
135 if module:get_option_boolean("carbons_v0") then |
f8d08f8ed7de
mod_carbons: Make support for v0 disabled by default, don't send v0 carbons for c2s
Michael Holzt <kju@fqdn.org>
parents:
884
diff
changeset
|
136 module:add_feature(xmlns_carbons_really_old); |
f8d08f8ed7de
mod_carbons: Make support for v0 disabled by default, don't send v0 carbons for c2s
Michael Holzt <kju@fqdn.org>
parents:
884
diff
changeset
|
137 end |