Sat, 09 Nov 2024 11:47:20 +0100
change language menu to settings menu and add timezone settings - fixes #402
184 | 1 | /* |
2 | * Copyright 2021 Mike Becker. All rights reserved. | |
3 | * | |
4 | * Redistribution and use in source and binary forms, with or without | |
5 | * modification, are permitted provided that the following conditions are met: | |
6 | * | |
7 | * 1. Redistributions of source code must retain the above copyright | |
8 | * notice, this list of conditions and the following disclaimer. | |
9 | * | |
10 | * 2. Redistributions in binary form must reproduce the above copyright | |
11 | * notice, this list of conditions and the following disclaimer in the | |
12 | * documentation and/or other materials provided with the distribution. | |
13 | * | |
14 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
15 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
16 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | |
17 | * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | |
18 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
19 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | |
20 | * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |
21 | * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |
22 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
23 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
24 | */ | |
25 | ||
26 | package de.uapcore.lightpit | |
27 | ||
28 | import de.uapcore.lightpit.DataSourceProvider.Companion.SC_ATTR_NAME | |
29 | import de.uapcore.lightpit.dao.DataAccessObject | |
30 | import de.uapcore.lightpit.dao.createDataAccessObject | |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
31 | import jakarta.servlet.http.Cookie |
254
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
32 | import jakarta.servlet.http.HttpServlet |
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
33 | import jakarta.servlet.http.HttpServletRequest |
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
34 | import jakarta.servlet.http.HttpServletResponse |
184 | 35 | import java.sql.SQLException |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
36 | import java.time.ZoneId |
184 | 37 | import java.util.* |
38 | ||
247 | 39 | abstract class AbstractServlet : HttpServlet() { |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
40 | |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
41 | companion object { |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
42 | const val COOKIE_MAX_AGE = 2592000 // 30 days |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
43 | const val LANGUAGE_COOKIE_NAME = "lpit_language" |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
44 | const val TIMEZONE_COOKIE_NAME = "lpit_timezone" |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
45 | } |
247 | 46 | |
47 | protected val logger = MyLogger() | |
184 | 48 | |
49 | /** | |
50 | * Contains the GET request mappings. | |
51 | */ | |
52 | private val getMappings = mutableMapOf<PathPattern, MappingMethod>() | |
53 | ||
54 | /** | |
55 | * Contains the POST request mappings. | |
56 | */ | |
57 | private val postMappings = mutableMapOf<PathPattern, MappingMethod>() | |
58 | ||
59 | protected fun get(pattern: String, method: MappingMethod) { | |
60 | getMappings[PathPattern(pattern)] = method | |
61 | } | |
62 | ||
63 | protected fun post(pattern: String, method: MappingMethod) { | |
64 | postMappings[PathPattern(pattern)] = method | |
65 | } | |
66 | ||
67 | private fun notFound(http: HttpRequest, dao: DataAccessObject) { | |
68 | http.response.sendError(HttpServletResponse.SC_NOT_FOUND) | |
69 | } | |
70 | ||
71 | private fun findMapping( | |
72 | mappings: Map<PathPattern, MappingMethod>, | |
73 | req: HttpServletRequest | |
74 | ): Pair<PathPattern, MappingMethod> { | |
75 | val requestPath = sanitizedRequestPath(req) | |
76 | val candidates = mappings.filter { it.key.matches(requestPath) } | |
77 | return if (candidates.isEmpty()) { | |
78 | Pair(PathPattern(requestPath), ::notFound) | |
79 | } else { | |
80 | if (candidates.size > 1) { | |
247 | 81 | logger.warn("Ambiguous mapping for request path '{0}'", requestPath) |
184 | 82 | } |
83 | candidates.entries.first().toPair() | |
84 | } | |
85 | } | |
86 | ||
87 | private fun invokeMapping( | |
88 | mapping: Pair<PathPattern, MappingMethod>, | |
89 | req: HttpServletRequest, | |
90 | resp: HttpServletResponse, | |
91 | dao: DataAccessObject | |
92 | ) { | |
93 | val params = mapping.first.obtainPathParameters(sanitizedRequestPath(req)) | |
94 | val method = mapping.second | |
247 | 95 | logger.trace("invoke {0}", method) |
184 | 96 | method(HttpRequest(req, resp, params), dao) |
97 | } | |
98 | ||
99 | private fun sanitizedRequestPath(req: HttpServletRequest) = req.pathInfo ?: "/" | |
100 | ||
101 | private fun doProcess( | |
102 | req: HttpServletRequest, | |
103 | resp: HttpServletResponse, | |
104 | mappings: Map<PathPattern, MappingMethod> | |
105 | ) { | |
106 | val session = req.session | |
107 | ||
108 | // the very first thing to do is to force UTF-8 | |
109 | req.characterEncoding = "UTF-8" | |
110 | ||
111 | // set some internal request attributes | |
112 | val http = HttpRequest(req, resp) | |
113 | val fullPath = req.servletPath + Optional.ofNullable(req.pathInfo).orElse("") | |
114 | req.setAttribute(Constants.REQ_ATTR_BASE_HREF, http.baseHref) | |
115 | req.setAttribute(Constants.REQ_ATTR_PATH, fullPath) | |
116 | req.getHeader("Referer")?.let { | |
117 | // TODO: add a sanity check to avoid link injection | |
118 | req.setAttribute(Constants.REQ_ATTR_REFERER, it) | |
119 | } | |
120 | ||
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
121 | // choose the requested language as session language (if available) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
122 | if (session.getAttribute(Constants.SESSION_ATTR_LANGUAGE) == null) { |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
123 | // language selection stored in cookie |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
124 | val cookieLocale = cookieLanguage(http) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
125 | |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
126 | // if no cookie, fall back to request locale a.k.a "Browser Language" |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
127 | val reqLocale = cookieLocale ?: req.locale |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
128 | |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
129 | val availableLanguages = availableLanguages() |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
130 | val sessionLocale = if (availableLanguages.contains(reqLocale)) reqLocale else availableLanguages.first() |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
131 | |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
132 | // select the language (this will also refresh the cookie max-age) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
133 | selectLanguage(http, sessionLocale) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
134 | |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
135 | logger.debug( |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
136 | "Setting language for new session {0}: {1}", session.id, sessionLocale.displayLanguage |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
137 | ) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
138 | } else { |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
139 | val sessionLocale = session.getAttribute(Constants.SESSION_ATTR_LANGUAGE) as Locale |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
140 | resp.locale = sessionLocale |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
141 | logger.trace("Continuing session {0} with language {1}", session.id, sessionLocale) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
142 | } |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
143 | |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
144 | // determine the timezone |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
145 | if (session.getAttribute(Constants.SESSION_ATTR_TIMEZONE) == null) { |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
146 | // timezone selection stored in cookie |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
147 | val cookieTimezone = cookieTimezone(http) |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
148 | |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
149 | // if no cookie, fall back to server's timezone (the browser does not transmit one) |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
150 | val timezone = cookieTimezone ?: ZoneId.systemDefault() |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
151 | |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
152 | selectTimezone(http, timezone) |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
153 | logger.debug("Timezone for session {0} set to {1}", session.id, timezone) |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
154 | } |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
155 | |
184 | 156 | // if this is an error path, bypass the normal flow |
157 | if (fullPath.startsWith("/error/")) { | |
158 | http.styleSheets = listOf("error") | |
159 | http.render("error") | |
160 | return | |
161 | } | |
162 | ||
163 | // obtain a connection and create the data access objects | |
164 | val dsp = req.servletContext.getAttribute(SC_ATTR_NAME) as DataSourceProvider | |
165 | val dialect = dsp.dialect | |
166 | val ds = dsp.dataSource | |
167 | if (ds == null) { | |
168 | resp.sendError( | |
169 | HttpServletResponse.SC_SERVICE_UNAVAILABLE, | |
170 | "JNDI DataSource lookup failed. See log for details." | |
171 | ) | |
172 | return | |
173 | } | |
174 | try { | |
175 | ds.connection.use { connection -> | |
176 | val dao = createDataAccessObject(dialect, connection) | |
177 | try { | |
178 | connection.autoCommit = false | |
179 | invokeMapping(findMapping(mappings, req), req, resp, dao) | |
180 | connection.commit() | |
181 | } catch (ex: SQLException) { | |
247 | 182 | logger.warn("Database transaction failed (Code {0}): {1}", ex.errorCode, ex.message) |
183 | logger.debug("Details: ", ex) | |
184 | 184 | resp.sendError( |
185 | HttpServletResponse.SC_INTERNAL_SERVER_ERROR, | |
186 | "Unhandled Transaction Error - Code: " + ex.errorCode | |
187 | ) | |
188 | connection.rollback() | |
189 | } | |
190 | } | |
191 | } catch (ex: SQLException) { | |
247 | 192 | logger.error("Severe Database Exception (Code {0}): {1}", ex.errorCode, ex.message) |
193 | logger.debug("Details: ", ex) | |
184 | 194 | resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Database Error - Code: " + ex.errorCode) |
195 | } | |
196 | } | |
197 | ||
198 | override fun doGet(req: HttpServletRequest, resp: HttpServletResponse) { | |
199 | doProcess(req, resp, getMappings) | |
200 | } | |
201 | ||
202 | override fun doPost(req: HttpServletRequest, resp: HttpServletResponse) { | |
203 | doProcess(req, resp, postMappings) | |
204 | } | |
205 | ||
206 | protected fun availableLanguages(): List<Locale> { | |
207 | val langTags = servletContext.getInitParameter(Constants.CTX_ATTR_LANGUAGES)?.split(",")?.map(String::trim) ?: emptyList() | |
208 | val locales = langTags.map(Locale::forLanguageTag).filter { it.language.isNotEmpty() } | |
208
785820da6485
fixes response locale not set for new sessions
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
209 | return locales.ifEmpty { listOf(Locale.ENGLISH) } |
184 | 210 | } |
211 | ||
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
212 | private fun cookieLanguage(http: HttpRequest): Locale? = |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
213 | http.request.cookies?.firstOrNull { c -> c.name == LANGUAGE_COOKIE_NAME } |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
214 | ?.runCatching {Locale.forLanguageTag(this.value)}?.getOrNull() |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
215 | |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
216 | protected fun sessionLanguage(http: HttpRequest) = http.session.getAttribute(Constants.SESSION_ATTR_LANGUAGE) as Locale |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
217 | |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
218 | private fun cookieTimezone(http: HttpRequest): ZoneId? = |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
219 | http.request.cookies?.firstOrNull { c -> c.name == TIMEZONE_COOKIE_NAME } |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
220 | ?.runCatching { ZoneId.of(this.value)}?.getOrNull() |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
221 | |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
222 | protected fun sessionTimezone(http: HttpRequest) = http.session.getAttribute(Constants.SESSION_ATTR_TIMEZONE) as String |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
223 | |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
224 | protected fun selectTimezone(http: HttpRequest, zoneId: ZoneId) { |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
225 | http.session.setAttribute(Constants.SESSION_ATTR_TIMEZONE, zoneId.id) |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
226 | val cookie = Cookie(TIMEZONE_COOKIE_NAME, zoneId.id) |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
227 | cookie.isHttpOnly = true |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
228 | cookie.path = http.request.contextPath |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
229 | cookie.maxAge = COOKIE_MAX_AGE |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
230 | http.response.addCookie(cookie) |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
231 | } |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
232 | |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
233 | protected fun selectLanguage(http: HttpRequest, locale: Locale) { |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
234 | http.response.locale = locale |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
235 | http.session.setAttribute(Constants.SESSION_ATTR_LANGUAGE, locale) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
236 | // delete cookie if language selection matches request locale, otherwise set cookie |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
237 | val cookie = Cookie(LANGUAGE_COOKIE_NAME, "") |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
238 | cookie.isHttpOnly = true |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
239 | cookie.path = http.request.contextPath |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
240 | if (http.request.locale.language == locale.language) { |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
241 | cookie.maxAge = 0 |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
242 | } else { |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
243 | cookie.value = locale.language |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
244 | cookie.maxAge = COOKIE_MAX_AGE |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
245 | } |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
246 | http.response.addCookie(cookie) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
247 | } |
184 | 248 | } |