Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-02 16:37:52 +01:00
Code Releases Activity
1,270 Commits 7 Branches 109 Tags 66 MiB
a4ee23edfe
Commit Graph

1025 Commits

Author SHA1 Message Date
Badlop
ae939c5f80 * src/ejabberd_c2s.erl: Put auth_module in Info always (EJAB-549) 
SVN Revision: 1454
 2008-07-16 18:05:46 +00:00
Christophe Romain
546bb02153 Rolled back the previous IP getting patch, and Report connection's IP address 
SVN Revision: 1451
 2008-07-16 13:29:57 +00:00
Badlop
663f6f76a7 * doc/guide.tex: Improve explanation of option 'hosts' in 
ejabberd_service
* doc/guide.html: Likewise

SVN Revision: 1448
 2008-07-16 10:21:45 +00:00
Badlop
b1ca88a5eb * src/configure.ac: Improve legibility 
* src/aclocal.m4: Likewise
* src/configure: Likewise

* src/ejabberdctl.template: Remove garbage variable. Document node
option

* doc/guide.tex: Add references to sections.
* doc/guide.html: Likewise

SVN Revision: 1438
 2008-07-12 21:32:45 +00:00
Badlop
cdcc3a2520 * doc/guide.tex: Document how to insert a newline character in 
welcome_message (EJAB-501)
* src/ejabberd.cfg.example: Likewise

SVN Revision: 1437
 2008-07-11 13:47:15 +00:00
Christophe Romain
3c90d7c2b9 change needed to support previous blacklist support 
SVN Revision: 1432
 2008-07-11 07:13:41 +00:00
Christophe Romain
bc18e89d61 Backport C2S blacklist support from trunk 
SVN Revision: 1431
 2008-07-11 06:59:45 +00:00
Badlop
e956ca4fe3 * src/configure.ac: Don't check for erlang header file (EJAB-232) 
* src/configure: Likewise

SVN Revision: 1430
 2008-07-10 18:09:18 +00:00
Badlop
53c994825c * src/configure.ac: Check for erlang header files (EJAB-232) 
* src/configure: Likewise

SVN Revision: 1429
 2008-07-09 21:33:34 +00:00
Badlop
085d979037 * src/mod_pubsub/mod_pubsub.erl: Fix compilation warnings 
* src/mod_pubsub/node_zoo.erl: Likewise
* src/mod_shared_roster.erl: Likewise

SVN Revision: 1428
 2008-07-09 21:26:25 +00:00
Badlop
49b02c0a9f * src/mod_muc/mod_muc_log.erl: Fix XHTML compliance: ensure some 
language is set, include ID attribute in each message, add
microseconds to ensure unique value (EJAB-497)

SVN Revision: 1426
 2008-07-09 18:39:41 +00:00
Badlop
d8405b694e * src/ejabberd_config.erl (load_file): error message on sasl.log 
is not flattened (EJAB-616)

SVN Revision: 1424
 2008-07-09 16:08:32 +00:00
Badlop
95bd9068f7 * doc/guide.tex: mod_muc_log XMPP URI supports the updated version 
RFC 5122 (EJAB-631)
* doc/guide.html: Likewise

SVN Revision: 1423
 2008-07-09 14:07:27 +00:00
Badlop
407d3b77b7 * tools/ejabberdctl: Work also when 'which' is unavailable 
SVN Revision: 1419
 2008-07-08 11:07:45 +00:00
Christophe Romain
1de6329c41 typo on date fix 
SVN Revision: 1415
 2008-07-08 10:18:54 +00:00
Christophe Romain
8047ff0617 improve ip fetching patch 
SVN Revision: 1414
 2008-07-08 10:17:50 +00:00
Badlop
8032533f26 * src/Makefile.in: Spool, config and log dirs: writtable by owner, 
readable by group, nothing by others (EJAB-686)
* doc/guide.tex: New section Securing sensible files
* doc/guide.html: Likewise

SVN Revision: 1413
 2008-07-07 14:52:47 +00:00
Badlop
00c3bc2450 * doc/guide.tex: Solaris Makefile install: use ginstall (thanks to 
Jonathan Auer)(EJAB-649)
* doc/guide.html: Likewise

SVN Revision: 1412
 2008-07-07 08:47:47 +00:00
Jérôme Sautret
c76a009238 Removed non ascii characters in changelog 
SVN Revision: 1411
 2008-07-04 08:35:11 +00:00
Jérôme Sautret
8012133539 * src/mod_privacy_odbc.erl: Support for privacy lists in MySQL (thanks to Igor Goryachev)(EJAB-538)(merge r1409 from trunk) 
SVN Revision: 1410
 2008-07-03 16:20:47 +00:00
Christophe Romain
1e56a614f9 PubSub improvements, and solves (EJAB-453) (EJAB-608) 
SVN Revision: 1407
 2008-07-03 09:56:21 +00:00
Badlop
971c9ce5a5 * src/ejabberd_ctl.erl: Web Admin and Ad-hoc admin: dump only 
persistent tables (EJAB-678)

SVN Revision: 1387
 2008-06-29 11:59:06 +00:00
Badlop
7abfd51534 * src/mod_pubsub/node_pep.erl: Complain if mod_caps disabled and 
mod_pubsub has PEP plugin enabled (EJAB-677)

SVN Revision: 1386
 2008-06-29 11:34:30 +00:00
Badlop
7e86698606 * src/web/ejabberd_http.erl: Support PUT and DELETE methods in 
ejabberd_http (thanks to Eric Cestari)(EJAB-662)

SVN Revision: 1373
 2008-06-21 00:19:57 +00:00
Badlop
45ccda9961 * doc/guide.tex: Explain that S2S outgoing first tries IPv4 and if 
that fails then tries IPv6
* doc/guide.html: Likewise

SVN Revision: 1372
 2008-06-21 00:12:06 +00:00
Badlop
541f381145 * src/ejabberd.app: The ejabberd version number is defined in the 
OTP application resource file, in the key 'vsn' (EJAB-657)
* src/ejabberd.hrl: The macro VERSION now consults the ejabberd
application key vsn
* src/configure.erl: Load the ejabberd application description
* doc/Makefile: Read ejabberd version from ejabberd.app vsn
* doc/api/Makefile: Likewise

SVN Revision: 1361
 2008-06-18 21:33:48 +00:00
Christophe Romain
ab310255d7 pubsub get_default bugfix (EJAB-656) 
SVN Revision: 1357
 2008-06-18 16:19:15 +00:00
Badlop
d9241c9e75 * src/ejabberd.cfg.example: Add registration_timeout (EJAB-653) 
SVN Revision: 1355
 2008-06-13 17:51:01 +00:00
Badlop
bc8294990a * doc/guide.tex: Title in HTML is shorter. Update several external URIs. 
SVN Revision: 1354
 2008-06-13 15:25:57 +00:00
Badlop
25d8e53735 * doc/guide.tex: Document ldap_local_filter (EJAB-179) 
SVN Revision: 1353
 2008-06-13 10:13:44 +00:00
Badlop
f59c0c9eb2 * doc/guide.tex: Table of listener modules converted to 
description. Table of modules overview simplified, and module
names link to their sections.
* doc/guide.html: Regenerated with all the latest changes

SVN Revision: 1352
 2008-06-12 23:52:13 +00:00
Badlop
aaae1339e1 * doc/guide.tex: Fix indentation of verbatim text 
SVN Revision: 1351
 2008-06-12 23:01:09 +00:00
Badlop
38d218c129 * doc/guide.tex: 
Changes in CSS: verbatim text is indented and has grey background;
descriptions are indented; table borders are softer.

SVN Revision: 1350
 2008-06-12 22:00:51 +00:00
Badlop
c67eaeb534 * doc/guide.tex: Permanent reference URL for sections (EJAB-651) 
SVN Revision: 1349
 2008-06-12 21:54:30 +00:00
Badlop
8a140dd509 * doc/guide.tex: Small fixes (thanks to Christoph Anton Mitterer) 
* doc/introduction.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1347
 2008-06-08 16:52:25 +00:00
Badlop
6924b4c3e8 * doc/guide.tex: Document ejabberdctl status code (EJAB-633) 
* doc/guide.html: Likewise

SVN Revision: 1346
 2008-06-05 12:04:43 +00:00
Badlop
73f40db258 * src/msgs/pl.msg: Bugfix in arguments of translated string that 
could crash the room (thanks to Anastasia Gornostaeva)

SVN Revision: 1345
 2008-06-04 13:21:36 +00:00
Badlop
56740871f1 * src/web/ejabberd_web.erl (make_xhtml/2): Allow to include 
elements in the HTTP header

SVN Revision: 1344
 2008-05-31 18:21:43 +00:00
Badlop
6c9eb98792 * src/odbc/odbc_queries.erl (del_user_return_password): Return 
password (thanks to Oleg Palij)

SVN Revision: 1343
 2008-05-31 17:09:13 +00:00
Badlop
50b133f6a2 * README: R12 support: remove compilation warning (EJAB-630) 
SVN Revision: 1340
 2008-05-22 00:01:18 +00:00
Badlop
fef60fe1d3 Retract the changes that SVN commit 1326 made in branches/ejabberd-2.0.x 
SVN Revision: 1339
 2008-05-20 16:23:43 +00:00
Badlop
45c1bad6d8 * doc/guide.html: Updated 
* doc/dev.html: Likewise
* doc/features.html: Likewise
* doc/version.tex: Likewise

* src/ejabberd.hrl: Version is 2.0.x

SVN Revision: 1336
 2008-05-19 09:46:42 +00:00
Badlop
6916d7b552 * src/configure.ac: R12 support: remove compilation 
warning (EJAB-630)
* src/configure: Likewise
* doc/guide.tex: Likewise

SVN Revision: 1334
 2008-05-19 09:20:35 +00:00
Badlop
39e93fcbbf * doc/guide.tex: Describe how to disable registration 
limitation (EJAB-614)

SVN Revision: 1333
 2008-05-19 09:13:19 +00:00
Christophe Romain
7461cb5f72 Change FSMTIMEOUT to 30s 
SVN Revision: 1327
 2008-05-16 15:28:23 +00:00
Christophe Romain
8e069daa61 fixing 1324 commit issue on tagged versions 
SVN Revision: 1326
 2008-05-16 14:23:37 +00:00
Christophe Romain
8041c033a9 Don't activate a socket untill its receiver process is controlling it 
SVN Revision: 1325
 2008-05-16 12:56:24 +00:00
Badlop
ca8c659804 * src/mod_muc/mod_muc_room.erl: Return Forbidden error message 
when user sends private message in a room that disallows
it (EJAB-595)

SVN Revision: 1323
 2008-05-12 20:35:43 +00:00
Badlop
a96cf33df3 * src/web/ejabberd_http.erl (parse_auth): Allow password that 
include colon character (EJAB-522)

SVN Revision: 1322
 2008-05-12 17:56:27 +00:00
Christophe Romain
2f62e78c06 XEP-0115 patch (EJAB-618) 
SVN Revision: 1312
 2008-04-30 08:49:19 +00:00
Badlop
fdae05c27d * src/ejabberd_s2s_out.erl: Improve confusing log message in s2s 
connection: wait_for_validation connect timeout (EJAB-617)

SVN Revision: 1311
 2008-04-29 16:59:03 +00:00
Badlop
58da3e4e99 * src/ejabberd.cfg.example: Small improvements in explanations 
* doc/guide.tex: Document MUC room options (EJAB-619)

SVN Revision: 1310
 2008-04-29 16:44:12 +00:00
Badlop
2c795957ac Merge changeset 1305 from ejabberd trunk. 
2008-04-27  Alexey Shchepin  <alexey@process-one.net>

* src/mod_muc/mod_muc_room.erl: Fixed room shaper processing

SVN Revision: 1309
 2008-04-28 18:44:28 +00:00
Badlop
6e5aaadf57 Merge changesets 1299, 1300 and 1302 from ejabberd trunk. 
2008-04-26  Badlop  <badlop@process-one.net>

* doc/guide.tex: Document option registration_timeout (EJAB-614)

2008-04-23  Alexey Shchepin  <alexey@process-one.net>

* src/treap.erl: Bugfix

* src/mod_register.erl: Fixed table creation, timeout isn't
activated when registration fails

* src/mod_register.erl: Restrict registration frequency per IP or
user (EJAB-614)
* src/ejabberd_c2s.erl: Pass IP to the c2s_unauthenticated_iq hook
* src/ejabberd_config.erl: Added registration_timeout option

* src/treap.erl: Treaps implementation

SVN Revision: 1308
 2008-04-28 18:41:13 +00:00
Badlop
0f4244a72c * doc/guide.tex: Document the option max_s2s_connections 
SVN Revision: 1307
 2008-04-28 18:07:23 +00:00
Badlop
e9e52374f8 * src/mod_shared_roster.erl: Fix for new registered accounts not 
being immediately shown in an 'all' special shared roster
group (thanks to Alexey Shchepin) (EJAB-71)
* src/mod_register.erl: New vhost event user_registered

SVN Revision: 1304
 2008-04-26 17:54:57 +00:00
Badlop
62ed66e195 * src/ejabberd_auth.erl: Improve anonymous authentication to not 
remove rosters accidentally (EJAB-549). New functions in
ejabberd_auth to get/check password and know which module accepted
the authentication. New element 'auth_module' in ejabberd_c2s
record 'statedata'. Cyrsasl provides a new property in the
response: {auth_module, AuthModule}.
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/cyrsasl_anonymous.erl: Likewise
* src/cyrsasl_digest.erl: Likewise
* src/cyrsasl_plain.erl: Likewise

SVN Revision: 1298
 2008-04-22 18:56:29 +00:00
Badlop
2e12fd2b11 * src/ejabberd_s2s_out.erl: Fix long timeout when reconnecting s2s 
after a remote server crash (EJAB-540)
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s.erl: Likewise
* doc/guide.tex: Likewise

SVN Revision: 1296
 2008-04-18 12:19:45 +00:00
Badlop
8d23ef3ed0 * doc/guide.tex: Clarification: PEP is enabled in default config 
SVN Revision: 1295
 2008-04-16 15:44:58 +00:00
Christophe Romain
bd9d2cb97c Cache negative response (EJAB-474) 
SVN Revision: 1293
 2008-04-14 12:00:37 +00:00
Badlop
bb5e7353a4 Merge SVN r1287 from trunk to 2.0.x branch: 
* src/tls/tls_drv.c: Fixed gcc signedness warnings (EJAB-447)
* src/ejabberd_zlib/ejabberd_zlib_drv.c: Likewise

* src/expat_erl.c: Removed R9B workaround (EJAB-447)

SVN Revision: 1289
 2008-04-11 09:25:54 +00:00
Christophe Romain
cfeb6f9c2b pubsub identity and database update bugfix 
SVN Revision: 1284
 2008-04-10 14:08:35 +00:00
Mickaël Rémond
0623a04666 *src/ejabberd_c2s.erl: Uniform default value for empty privacy list. Fixes (EJAB-603). 
SVN Revision: 1283
 2008-04-10 09:53:07 +00:00
Badlop
397fbf5b73 * src/ejabberd_auth_ldap.erl: LDAP function to get the number of 
registered users is too slow (EJAB-331): set timeout in LDAP
search queries (thanks to Evgeniy Khramtsov) and return the number
of registered users.

SVN Revision: 1280
 2008-04-08 09:37:06 +00:00
Mickaël Rémond
6f205d2d2a * doc/guide.tex: Documented the IQ discipline {queue, N}. 
SVN Revision: 1279
 2008-04-07 13:27:03 +00:00
Badlop
e8dd27d3fc * doc/guide.tex: Fix default_room_opts with default_room_options 
* doc/guide.html: Likewise

SVN Revision: 1277
 2008-04-05 10:53:32 +00:00
Badlop
73f061c02c * src/ejabberd_auth_ldap.erl (get_vh_registered_users_number): New 
function that returns 0 registered users (EJAB-331).

SVN Revision: 1276
 2008-04-04 18:57:01 +00:00
Badlop
6f19f7ebbb * src/ejabberd_c2s.erl (process_presence_probe): Don't route a 
presence probe to oneself (EJAB-498)

SVN Revision: 1275
 2008-04-03 22:35:26 +00:00
Christophe Romain
615dc9ff94 Do not ignore values passed from configure (EJAB-592) 
SVN Revision: 1271
 2008-04-02 14:24:00 +00:00
Christophe Romain
cd26cb4ad6 clone iq_response table bugfix 
SVN Revision: 1270
 2008-04-02 12:18:22 +00:00
Christophe Romain
22b66e40e0 add condition inclusion of pep in disco identity (EJAB-564) 
SVN Revision: 1269
 2008-04-02 09:06:34 +00:00
Badlop
3f33ff0adf * doc/webadmmain.png: Updated to ejabberd 2.0.0 
* doc/webadmmainru.png: Likewise

* doc/disco.png: Removed because not used

* doc/guide.tex: Fix Latex reference to webadmin section. Update
explanation of screenshots. Update xmpp addresses of Mickael
Remond and Sander Devrieze.
* doc/guide.html: Likewise

* doc/Makefile: Remove the Hevea deprecated option -noiso
* doc/guide.html: Likewise
* doc/dev.html: Likewise
* doc/features.html: Likewise

SVN Revision: 1262
 2008-03-31 10:48:10 +00:00
Badlop
fcb5788568 * doc/guide.tex: Fix epam location (thanks to Evgeniy Khramtsov) 
* doc/guide.html: Likewise

SVN Revision: 1259
 2008-03-27 00:28:44 +00:00
Badlop
f404bac82a * src/Makefile.in: Only try to install epam if pam was enabled 
in configure script (thanks to Etan Reisner)(EJAB-586)

SVN Revision: 1256
 2008-03-25 18:59:45 +00:00
Badlop
7dcd189e27 * src/Makefile.in: Failure to install epam is not 
critical (EJAB-573)

SVN Revision: 1255
 2008-03-25 17:18:47 +00:00
Badlop
9c11783e05 * doc/guide.tex: mod_vcard_ldap replace NICK with NICKNAME (thanks 
to Andreas Ntaflos)
* doc/guide.html: Likewise

SVN Revision: 1254
 2008-03-24 18:57:41 +00:00
Badlop
c74e7e8a17 * src/msgs/de.msg: Fix irc typo (thanks to Jonathan Schleifer) 
* src/msgs/cs.msg: Likewise
* src/msgs/pl.msg: Likewise
* src/msgs/sk.msg: Likewise

SVN Revision: 1253
 2008-03-24 01:28:55 +00:00
Mickaël Rémond
635565ecf3 * src/eldap/Makefile.in: Generate ELDAPv3.beam during first Makefile pass (EJAB-583). 
SVN Revision: 1250
 2008-03-22 16:44:23 +00:00
Badlop
c25f960220 * doc/guide.tex: Document service_check_from (EJAB-576) 
* doc/guide.html: Likewise

SVN Revision: 1248
 2008-03-22 00:33:28 +00:00
Badlop
6aa2f740f4 * src/mod_caps.erl: Move two log calls ERROR_MSG to DEBUG 
* src/shaper.erl: Move log call INFO_MSG to DEBUG

SVN Revision: 1247
 2008-03-21 18:58:07 +00:00
Badlop
20ebe81384 * doc/guide.tex: Document s2s_default_policy and 
s2s_host (EJAB-575)
* doc/guide.html: Likewise

SVN Revision: 1246
 2008-03-21 16:17:37 +00:00
Christophe Romain
9e60b2b0a6 Pubsub subscription is now wrapped in pubsub tags (EJAB-580) 
SVN Revision: 1245
 2008-03-21 16:05:42 +00:00
Christophe Romain
6d7b71f13c Seek epam binary into priv/bin (EJAB-573) 
SVN Revision: 1241
 2008-03-21 15:35:40 +00:00
Christophe Romain
dc37faf587 Rewrite io:format calls to loglevel macros (EJAB-555) so we do not loose debug anymore in detached nodes 
SVN Revision: 1240
 2008-03-21 15:00:59 +00:00
Badlop
bc2f42132f * doc/guide.tex: Improve explanation of how to start ejabberd when 
binary installer. Don't recommend R12 in Windows compilation.
Describe what happens if maxrate shaper is exceeded.
* doc/guide.html: Likewise

SVN Revision: 1238
 2008-03-20 19:24:27 +00:00
Mickaël Rémond
da5f069dd2 * src/eldap.erl: Improved logging. We now use ejabberd logging framework (EJAB-582). 
* src/eldap.erl: Faster LDAP reconnection (Thanks to Christophe Romain) (EJAB-581)

SVN Revision: 1237
 2008-03-20 16:38:29 +00:00
Mickaël Rémond
1a616a91ef * src/ejabberd_s2s.erl: API improvement: Added s2s_connect_hook (EJAB-566). 
SVN Revision: 1233
 2008-03-15 09:39:10 +00:00
Badlop
c086292651 * src/odbc/ejabberd_odbc.erl: Start ODBC explicitely because 
Erlang R12 doesn't start automatically like in R11 and
older (thanks to Sergei Golovan)(EJAB-541)

SVN Revision: 1231
 2008-03-13 14:34:47 +00:00
Badlop
c62a0562a1 * src/ejabberd.hrl: Removed unused ejabberd_debug and 
PRIVACY_SUPPORT. Reordered the remaining options

SVN Revision: 1230
 2008-03-13 14:13:29 +00:00
Badlop
ffb1f97cf4 * doc/guide.tex: Describe option Matches in mod_vcard_ldap (thanks 
to Evgeniy Khramtsov)(EJAB-530).  Fix typo in the description of
ldap_server option.
* doc/guide.html: Likewise

SVN Revision: 1229
 2008-03-13 10:59:57 +00:00
Badlop
17e751521f * src/mod_echo.erl: Small change to avoid a compilation warning of 
unused function

SVN Revision: 1228
 2008-03-12 23:05:49 +00:00
Badlop
4be522ed0c * src/web/ejabberd_web_admin.erl (term_to_string): Show Erlang 
terms in one line in Erlang R12 (EJAB-503)

SVN Revision: 1227
 2008-03-12 22:29:53 +00:00
Badlop
c4e89879bb * src/ejabberd_s2s_in.erl (get_cert_domains): When compiling with 
Erlang R12, replace the calls to deprecated module PKIX1Explicit88
with OTP-PKIX (EJAB-556)

SVN Revision: 1226
 2008-03-11 14:25:35 +00:00
Badlop
1643999c35 * src/ejabberd_update.erl: Fix crash when browsing the Update 
page in Erlang R12 (EJAB-552)

SVN Revision: 1225
 2008-03-10 11:59:53 +00:00
Badlop
5351f56ae1 * src/mod_proxy65/mod_proxy65_service.erl: Implement alternative 
to the deprecated function inet:ip_to_bytes (thanks to Evgeniy
Khramtsov)(EJAB-542)

SVN Revision: 1222
 2008-03-09 10:09:38 +00:00
Badlop
c6f57c13da * doc/guide.tex: Improve documentation of host_config 
add (EJAB-544)
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise
* src/ejabberd_config.erl: Likewise

SVN Revision: 1219
 2008-03-04 10:36:57 +00:00
Badlop
a6e65dd5a9 * doc/guide.tex: mod_announce recommends, but doesn't require 
mod_adhoc (thanks to Anastasia Gornostaeva)
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise

SVN Revision: 1218
 2008-03-04 09:07:43 +00:00
Mickaël Rémond
45074f5349 * src/mod_roster.erl: Fixed "from" attribute in roster pushes 
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 1214
 2008-02-29 07:54:24 +00:00
Badlop
4ee0f6a5ee * src/ejabberd_app.erl (prep_stop): Stop modules when stopping 
ejabberd (EJAB-536)
* src/mod_caps.erl (stop): Probably not needed to stop supervisor
child (EJAB-536)
* src/mod_muc/mod_muc.erl (room_destroyed): Catch message
sending (EJAB-536)
* src/mod_muc/mod_muc_room.erl (init): Ensure rooms are called
when the process dies due to a linked die (EJAB-536)

SVN Revision: 1212
 2008-02-28 00:30:23 +00:00
Mickaël Rémond
5171a8caec * src/ejabberd_check.erl: Separate config loading from configuration sanity checks (EJAB-533) 
* src/src/ejabberd_app.erl: Likewise
* src/ejabberd_app.erl: Likewise

SVN Revision: 1211
 2008-02-27 20:20:30 +00:00