Jean-Sébastien Pédron
332fb55e3a
MFC:
...
Merge revisions from 1362 to revision 1434 from trunk.
SVN Revision: 1435
2008-07-11 12:48:27 +00:00
Jean-Sébastien Pédron
5610d00b4d
Convert to exmpp. Note that this module hasn't been tested yet!
...
SVN Revision: 1434
2008-07-11 12:41:48 +00:00
Jean-Sébastien Pédron
8bfccb42a9
Exmpp now takes care of stanza serialization and compatible namespaces.
...
SVN Revision: 1433
2008-07-11 12:40:49 +00:00
Badlop
429b7bc169
* 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
cd5bc22bdb
* 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
f1f0bb0431
* 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
a2bed6709c
* src/mod_shared_roster.erl: Allow to get subscribed to a contact
...
that is already in the roster by means of a shared roster group:
add it to another roster group and it gets subscribed
automatically (EJAB-407)
* src/mod_roster.erl: Likewise
SVN Revision: 1427
2008-07-09 19:06:44 +00:00
Badlop
fc911a43ff
* 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
1f004c56ac
* src/mod_register.erl: Support for io_lib newline character in
...
the body of welcome_message (EJAB-501)
* doc/guide.tex: Document the newline character
* src/ejabberd.cfg.example: Example usage of newline character
SVN Revision: 1425
2008-07-09 17:53:56 +00:00
Badlop
e3ba72f3dd
* 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
70d2682c6a
* 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
Jean-Sébastien Pédron
7ca5bebab3
Convert to exmpp.
...
SVN Revision: 1422
2008-07-09 09:16:03 +00:00
Jean-Sébastien Pédron
d5aa4be7e5
Convert #xmlelement returned by the 'c2s_stream_features' hook to
...
#xmlel.
SVN Revision: 1421
2008-07-09 09:14:19 +00:00
Jean-Sébastien Pédron
1a687a4f1a
SASL errors are now atoms, not strings anymore.
...
SVN Revision: 1420
2008-07-08 15:43:52 +00:00
Badlop
19308d34e2
* tools/ejabberdctl: Work also when 'which' is unavailable
...
SVN Revision: 1419
2008-07-08 11:07:45 +00:00
Christophe Romain
92ce9af092
typo fix
...
SVN Revision: 1418
2008-07-08 10:31:47 +00:00
Christophe Romain
f74fb8ea2d
improve ip fetching patch
...
SVN Revision: 1416
2008-07-08 10:19:57 +00:00
Badlop
9626c41817
* 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
19a1ddfa44
* 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
52390e1876
Removed non ascii characters in changelog
...
SVN Revision: 1411
2008-07-04 08:35:11 +00:00
Jérôme Sautret
d5e2002ffa
* src/mod_privacy_odbc.erl: Support for privacy lists in MySQL (thanks to Igor Goryachev)(EJAB-538)
...
SVN Revision: 1409
2008-07-03 16:09:45 +00:00
Christophe Romain
35d25d3420
PubSub improvements, and solves (EJAB-453) (EJAB-608)
...
SVN Revision: 1408
2008-07-03 09:56:31 +00:00
Jean-Sébastien Pédron
13b78b1ad2
Routing is now done with #xmlel. A warning is printed if those modules
...
have to route an old #xmlelement.
SVN Revision: 1406
2008-07-01 15:51:34 +00:00
Jean-Sébastien Pédron
48cf5cb84a
Do not use the #iq record anymore internally. However it's still created
...
and passed to other modules.
SVN Revision: 1405
2008-07-01 14:25:02 +00:00
Jean-Sébastien Pédron
5317dd64d7
Change warning message.
...
SVN Revision: 1404
2008-07-01 14:20:20 +00:00
Jean-Sébastien Pédron
a25609f66b
Accept new #xmlel in functions that create #iq. A warning is printed
...
when these functions are called with an old #xmlelement.
SVN Revision: 1403
2008-07-01 14:19:36 +00:00
Jean-Sébastien Pédron
d6e6432a46
Convert to exmpp.
...
SVN Revision: 1402
2008-07-01 13:34:51 +00:00
Jean-Sébastien Pédron
094fa47f9f
Convert gen_iq_handler to exmpp.
...
SVN Revision: 1401
2008-07-01 10:21:35 +00:00
Jean-Sébastien Pédron
6f7cf2e58b
Use a function to convert to old structures instead of duplicating code
...
inside the module.
SVN Revision: 1400
2008-07-01 10:20:01 +00:00
Jean-Sébastien Pédron
b08ae07347
acl doesn't require conversion anymore.
...
SVN Revision: 1399
2008-07-01 09:46:57 +00:00
Jean-Sébastien Pédron
ffbf8d5faa
Convert acl to exmpp.
...
SVN Revision: 1398
2008-07-01 09:41:32 +00:00
Jean-Sébastien Pédron
f55274c7fb
o Use jlib:short_bare_jid/1.
...
o Rewrite is_auth_packet/1 to use new formats.
o Don't convert <presence/> before calling ejabberd_sm:set_presence/7.
o Don't convert broadcast children, because it's an internal special
element.
SVN Revision: 1397
2008-07-01 09:17:48 +00:00
Jean-Sébastien Pédron
b9074097da
Forgot to convert a <presence/> from the new to the old record.
...
SVN Revision: 1396
2008-07-01 09:13:49 +00:00
Jean-Sébastien Pédron
83a33726ce
Add function short_bare_jid/1.
...
SVN Revision: 1395
2008-07-01 09:12:59 +00:00
Jean-Sébastien Pédron
8c33e12616
Use the new clause of exmpp_stanza:reply_with_error/2, exmpp_iq:error/2,
...
exmpp_iq:error_without_original/2 and the new exmpp_jid:make_bare_jid/1.
SVN Revision: 1394
2008-07-01 08:01:06 +00:00
Jean-Sébastien Pédron
87218e1447
Convert to exmpp.
...
SVN Revision: 1393
2008-07-01 07:49:57 +00:00
Jean-Sébastien Pédron
06965000a5
Before doing any routing, the router print a warning if old structures
...
are used. Then it converts the structures to the old format and route
them. The router doesn't care about the structures format but the
conversion is necesary for code called from this module.
In C2S and S2S, no conversion is done before calling
ejabberd_router:route/3.
SVN Revision: 1392
2008-06-30 16:55:03 +00:00
Jean-Sébastien Pédron
cc033b3b98
o Use the new functions from jlib.
...
o Use the new exmpp_xml:node_to_list/3.
SVN Revision: 1391
2008-06-30 15:51:23 +00:00
Jean-Sébastien Pédron
290040ad9d
o Add function to convert to and from old ejabberd #jid record.
...
o Move function short_jid/1 from ejabberd_c2s.
SVN Revision: 1390
2008-06-30 15:49:58 +00:00
Jean-Sébastien Pédron
264e72830b
Convert to exmpp.
...
SVN Revision: 1389
2008-06-30 14:04:31 +00:00
Jean-Sébastien Pédron
d05c2ee8a1
Use -include_lib instead of -include to include exmpp.hrl. This is a
...
better solution than specifying the path (with -I) on erlc(1) command
line.
SVN Revision: 1388
2008-06-30 12:13:15 +00:00
Badlop
2ccf410a75
* 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
5e25cbcaa9
* 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
152efbb112
* src/mod_muc/mod_muc_room.erl: Allow to store room
...
description (thanks to Christopher Dupont)(EJAB-670)
SVN Revision: 1385
2008-06-28 17:47:19 +00:00
Jean-Sébastien Pédron
b32aba27c1
o Use the new exmpp namespace macro names.
...
o Update send_element/2 to use exmpp new to_list functions.
SVN Revision: 1384
2008-06-27 13:46:08 +00:00
Jean-Sébastien Pédron
22e79490ff
Convert to exmpp.
...
SVN Revision: 1383
2008-06-26 15:48:19 +00:00
Jean-Sébastien Pédron
1a311a30b5
o Use a macro in ?DEFAULT_NS instead of the namespace atom directly.
...
o Comment DBGFSM our again.
o Remove macro ERR_SERVICE_UNAVAILABLE.
o In wait_for_auth and is_auth_packet, an empty resource is returned as
'undefined', not the empty string in the {auth, ...} tuple.
o In handle_sync_event, remove a debugging printf.
o In handle_info({route, ...}), use macro IS_PRESENCE & friends instead
of direct matching with NS_JABBER_CLIENT and name. This way, the S2S
doesn't have to change the namespace of all its incoming stanzas to
NS_JABBER_CLIENT.
o In send_element, for stanzas under the NS_JABBER_SERVER namespace, lie
to exmpp_xml by telling it that this namespace is the default one.
SVN Revision: 1382
2008-06-26 15:47:21 +00:00
Jean-Sébastien Pédron
999f3233bb
Fix short JID comparison in get_subscribed_and_online; it was using
...
'undefined' instead of empty strings.
SVN Revision: 1381
2008-06-25 13:27:03 +00:00
Jean-Sébastien Pédron
07651d712f
Finish ejabberd_c2s conversion with the functions related to offline
...
stanzas.
SVN Revision: 1380
2008-06-25 12:37:45 +00:00
Jean-Sébastien Pédron
6f931ce4fd
Convert all presence-related functions.
...
SVN Revision: 1378
2008-06-24 16:12:56 +00:00