Jean-Sébastien Pédron
67a87af459
Merge from trunk (r1563 to r1613).
...
PR: EJABP-1
SVN Revision: 1614
2008-10-08 12:02:30 +00:00
Jérôme Sautret
b65caa82fb
* src/mod_roster_odbc.erl: fix MySQL multiple requests issue.
...
SVN Revision: 1612
2008-10-07 12:32:12 +00:00
Jean-Sébastien Pédron
aaecdc4b8a
Convert to exmpp.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1611
2008-10-07 12:20:09 +00:00
Jean-Sébastien Pédron
78466384c4
Convert to exmpp.
...
PR: EJABP-1
SVN Revision: 1610
2008-10-07 09:55:38 +00:00
Jean-Sébastien Pédron
ca7a0813b4
Fix a bug where an error stanza was not created correctly, leading to
...
ejabberd_c2s crash.
PR: EJABP-1
SVN Revision: 1609
2008-10-07 09:54:53 +00:00
Jean-Sébastien Pédron
bc0d8613ab
Fix status handling by always using binaries: until now, we were mixing
...
lists and binaries in a non-working way.
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1608
2008-10-06 15:16:09 +00:00
Jean-Sébastien Pédron
0434c1424a
The Mnesia table wasn't updated when converting from an old schema.
...
PR: EJABP-1
SVN Revision: 1607
2008-10-06 15:14:01 +00:00
Jean-Sébastien Pédron
3f8a303286
Convert to exmpp.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1606
2008-10-06 15:01:36 +00:00
Badlop
10ab4e6782
* doc/guide.html: Regenerated
...
* doc/guide.tex: Fix a problem in SVN merge from trunk
SVN Revision: 1605
2008-10-06 15:01:06 +00:00
Jean-Sébastien Pédron
5ceffdd5a7
Fix a confusion between #jid and tuples.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1604
2008-10-06 15:00:34 +00:00
Jean-Sébastien Pédron
01da93bf70
mod_privacy & friends may return an empty list.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1603
2008-10-06 14:58:45 +00:00
Jean-Sébastien Pédron
028a3c2ded
Fix a bug where we were matching on #iq.type instead of #iq.kind,
...
resulting in bad-request sent to the client.
PR: EJABP-1
SVN Revision: 1602
2008-10-06 14:56:36 +00:00
Jérôme Sautret
2f8127d343
* src/ejabberd_rdbms.erl: fix SQL database reconnection
...
issues (EJAB-764) and add odbc_start_interval configuration
directive (default to 30 seconds).
* src/odbc/ejabberd_odbc.erl: likewise.
* src/odbc/ejabberd_odbc_sup.erl: likewise.
* doc/guide.tex: likewise.
SVN Revision: 1600
2008-10-06 14:18:46 +00:00
Jérôme Sautret
a2340ea8b8
* src/odbc/odbc_queries.erl: Fix empty query that fail on MySQL.
...
SVN Revision: 1597
2008-10-03 15:42:40 +00:00
Jérôme Sautret
744b827169
* src/mod_vcard_odbc: added vCard support for MS SQL Server 2005 (missing from previous commit)
...
SVN Revision: 1596
2008-10-03 15:30:56 +00:00
Jérôme Sautret
8883e4ad8b
* src/mod_vcard_odbc: added vCard support for MS SQL Server 2005.
...
* src/odbc/odbc_queries.erl: likewise.
* src/odbc/mssql2005.sql: likewise.
SVN Revision: 1595
2008-10-03 15:29:48 +00:00
Jean-Sébastien Pédron
1698b8ec04
o In start/2 and stop/1, the IQ registration must use a namespace as
...
atom, not list.
o The functions process_local_iq/3, process_sm_iq/3 and get_last/3
receive an #iq, not an #xmlel.
o In store_last_info/4 and remove_user/2, add try/catch block around
exmpp_stringprep:*prep/1 uses.
SVN Revision: 1594
2008-10-02 14:59:48 +00:00
Jean-Sébastien Pédron
9e018532c8
o In #jid, when the node isn't specified, it defaults to the atom
...
"undefined", not an empty binary.
o Fix a bug where we expected an #xmlelement to have only one #xmlcdata
child.
SVN Revision: 1593
2008-10-02 13:52:39 +00:00
Jean-Sébastien Pédron
24cb7cb039
exmpp_xml:get_element_by_name/2 is deprecated; use
...
exmpp_xml:get_element/2 instead.
SVN Revision: 1592
2008-10-02 13:34:52 +00:00
Jean-Sébastien Pédron
7c28aba6a1
Fix a bug where a JID represented as a tuple was used in a function
...
expecting a #jid.
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1591
2008-10-02 13:17:49 +00:00
Mickaël Rémond
3a2fb34a61
* src/mod_shared_roster.erl: Correct roster push when changing a shared roster entry name (EJAB-738).
...
SVN Revision: 1590
2008-10-01 14:52:25 +00:00
Jean-Sébastien Pédron
2309f9b8bc
Fix multiple bugs in ODBC mods.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1589
2008-10-01 09:41:57 +00:00
Badlop
16a508cdb9
* src/*/Makefile.win32: Provide explicit beam filenames because
...
nmake does not accept wildcards (thanks to Attila
Vangel)(EJAB-543)
SVN Revision: 1588
2008-09-30 16:12:05 +00:00
Christophe Romain
43647c6d50
fix licence header
...
SVN Revision: 1587
2008-09-30 08:58:37 +00:00
Jean-Sébastien Pédron
ddcb94649d
Fill exmpp_xml known list with the nss/names/attrs used by this module.
...
SVN Revision: 1585
2008-09-29 13:19:11 +00:00
Jean-Sébastien Pédron
5f7e16eac3
Add the {autoload_known, true} flag to the XML parser options. This
...
allows modules to extend the known nss/names/attrs with their own data.
SVN Revision: 1584
2008-09-29 13:17:21 +00:00
Jean-Sébastien Pédron
da034b3090
Fix a bug in #xmlel construction: children must be a list.
...
SVN Revision: 1583
2008-09-29 11:30:25 +00:00
Jean-Sébastien Pédron
12d515a8fe
Convert to exmpp (not tested yet).
...
SVN Revision: 1582
2008-09-29 11:29:09 +00:00
Jean-Sébastien Pédron
f5f3c85112
Remove compatibility code (not tested yet).
...
SVN Revision: 1581
2008-09-29 10:38:04 +00:00
Jean-Sébastien Pédron
d8153b702a
o Add try/catch block around exmpp_stringprep:*prep/1 uses.
...
o Add table conversion.
o In get_last/3, do not convert status to binary because it's already
one.
SVN Revision: 1580
2008-09-29 10:34:06 +00:00
Jean-Sébastien Pédron
9a4f5bb2d9
When the status is not specified in a presence stanza, default to an
...
empty binary, not an empty string; this is what mod_last expects.
SVN Revision: 1579
2008-09-29 10:31:24 +00:00
Jean-Sébastien Pédron
7624284070
Remove compatilibity code.
...
SVN Revision: 1578
2008-09-29 09:42:46 +00:00
Jean-Sébastien Pédron
c32cbd90e8
Fix a bug in parse_xdata_submit/1 and parse_xdata_fields/2 where
...
exmpp_xml:get_attribute_from_list/3 was called with only 2 arguments;
this code has not been updated when exmpp_xml's API changed...
SVN Revision: 1577
2008-09-29 09:42:05 +00:00
Christophe Romain
70dd325aef
EJAB-739 and EJAB-751 improvements
...
SVN Revision: 1576
2008-09-25 17:26:06 +00:00
Jean-Sébastien Pédron
c068d20588
In mod_offline:
...
o Remove any compatibility code: the core of Ejabberd expects new
structures.
o Add table conversion.
o Add try/catch block around exmpp_stringprep:*prep/1 uses.
To permit the complete removal of the compatibility code, jlib had to be
changed too: the timestamp_to_xml/1 function now returns an #xmlel.
SVN Revision: 1575
2008-09-25 10:46:00 +00:00
Jean-Sébastien Pédron
c74ab439ef
Convert to exmpp.
...
SVN Revision: 1574
2008-09-23 13:11:05 +00:00
Jean-Sébastien Pédron
44c77364ce
Fix a typo in the exmpp_stringprep module name.
...
SVN Revision: 1573
2008-09-23 13:10:33 +00:00
Jean-Sébastien Pédron
0dbbf53fbe
o Fix a misuse of exmpp_stanza:error/2: the namespace argument (the
...
first one) was missing.
o Fix a bug in process_privacy_iq/4 where the #iq record was not
converted back to an #xmlel before calling ejabberd_router:route/3.
SVN Revision: 1572
2008-09-23 13:09:32 +00:00
Jean-Sébastien Pédron
052d006c88
Fix a typo in the exmpp_stringprep module name.
...
SVN Revision: 1571
2008-09-23 13:06:45 +00:00
Jean-Sébastien Pédron
0e91ea9e5f
o Fix a bug in process_sm_iq/3 where a badmatch exception was raised
...
when the user didn't have a vCard.
o Fix a bug in remove_user/2 where the exmpp_jid module was use instead
of exmpp_stringprep.
SVN Revision: 1570
2008-09-23 13:05:43 +00:00
Mickaël Rémond
eabd25a8bf
* src/mod_configure.erl: Fix adhoc commands reply types for "get-online-users-num" and "get-registered-users-num" (EJAB-756).
...
SVN Revision: 1569
2008-09-22 16:08:37 +00:00
Jean-Sébastien Pédron
5803c51633
Convert to exmpp.
...
SVN Revision: 1568
2008-09-22 11:18:08 +00:00
Jean-Sébastien Pédron
35a7342416
o Remove unappropriate comments in get_sm_features/5.
...
o Use the '_s' variants of NS_* macros instead of a call to
atom_to_list/1 in do_route/4.
o A call to the stringprep module was left in filter_fields/3.
SVN Revision: 1567
2008-09-22 11:17:23 +00:00
Jean-Sébastien Pédron
e9d7ac68da
o Fix a bug in get_in_pending_subscriptions() where the type of the
...
presence stanza was lost.
o Reorganize a few lines in user_roster() to match mod_roster_odbc.
SVN Revision: 1566
2008-09-18 14:55:43 +00:00
Jean-Sébastien Pédron
56a0c8ed1d
Convert to exmpp.
...
SVN Revision: 1565
2008-09-18 14:55:03 +00:00
Jean-Sébastien Pédron
4eaa8e19c9
Merge from trunk (r1457 to r1563).
...
SVN Revision: 1564
2008-09-16 14:39:57 +00:00
Badlop
7ff346f612
* doc/guide.tex: Fix explanation of mod_muc's anonymous
...
option. Make clear that an ejabberd_service can only serve a
single external component. Provide Mnesia directory when setting
clustering (thanks to Matthew Reilly)
SVN Revision: 1563
2008-09-15 18:38:52 +00:00
Badlop
81c70c347f
Fix: provide the port as an integer, not string (EJAB-560)
...
SVN Revision: 1562
2008-09-12 14:31:04 +00:00
Badlop
e9d62b39ef
* src/web/ejabberd_http.hrl: Provide Host, Port, Headers and
...
Transfer Protocol in request (thanks to Eric Cestari)(EJAB-560)
* src/web/ejabberd_http.erl: Likewise
SVN Revision: 1561
2008-09-12 11:45:16 +00:00
Badlop
df39f93b80
* doc/guide.tex: Fix mod_proxy configuration example
...
* doc/guide.html: Likewise
SVN Revision: 1560
2008-09-02 17:31:10 +00:00