Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-28 17:38:54 +01:00
Code Releases Activity
1,465 Commits 7 Branches 110 Tags 68 MiB
85412f0a41
Commit Graph

1202 Commits

Author SHA1 Message Date
Jean-Sébastien Pédron
8a27b5446d Fix accesses to the new #jid opaque type. 
PR:		EJABP-1

SVN Revision: 1825
 2009-01-19 10:14:55 +00:00
Jean-Sébastien Pédron
2cc2039ad8 Merge from trunk (r1734 to r1752). 
Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1737, r1740, r1745, r1747, r1748.

Additionnaly, any deprecated content was removed from jlib.hrl. This
leaves only the new RSM records.

Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1824
 2009-01-19 10:14:04 +00:00
Pablo Polvorin
2538001b08 Store registered nicknames, rooms and domains as binary(). 
Use document_to_iolist/1 and iolist_size/1 instead of document_to_list/1.

SVN Revision: 1820
 2009-01-15 15:21:54 +00:00
Pablo Polvorin
e8f630b93a mod_pubsub: initial update to new hooks API (using binaries). mod_pubsub is still unusable with exmpp. 
SVN Revision: 1809
 2009-01-12 18:17:05 +00:00
Pablo Polvorin
49210e3099 Apply commit 1212 (caps handling fix), was incorrectly overwritten on 1770. 
SVN Revision: 1807
 2009-01-12 18:15:44 +00:00
Pablo Polvorin
96c0ff44f9 Fix typo 
SVN Revision: 1806
 2009-01-12 15:51:22 +00:00
Christophe Romain
89be1c2ede fix owners cache and fix unsubscribe permissions (EJAB-840) 
SVN Revision: 1800
 2009-01-11 02:05:41 +00:00
Pablo Polvorin
c77f7e727b Update gen_iq_handler API, require the 'Host' argument to be in binary() format. 
Fix bug in vcard user search, odbc backend.

SVN Revision: 1796
 2009-01-10 16:10:12 +00:00
Christophe Romain
36080fb682 fix unsubscription of full jid subscribed node (EJAB-839) 
SVN Revision: 1795
 2009-01-10 13:40:38 +00:00
Pablo Polvorin
98f51dc91f Adapt to new exmpp API where get_id/1, get_lang/1, get_initiating_entity/1, get_receiving_entity/1 and get_type/1 returns binary(). 
SVN Revision: 1791
 2009-01-09 19:18:46 +00:00
Christophe Romain
d2524b20d5 minor pubsub fixes 
SVN Revision: 1782
 2009-01-08 18:44:11 +00:00
Christophe Romain
068c93e562 fix EJAB-701 and EJAB-836 
SVN Revision: 1781
 2009-01-08 17:27:47 +00:00
Pablo Polvorin
e0e58711bb XML attributes as binary(). Change Node argument to binary in the following hooks: 
disco_local_items, disco_local_features, disco_local_identity, disco_sm_items and 
disco_sm_identity.

SVN Revision: 1780
 2009-01-08 14:54:00 +00:00
Pablo Polvorin
2cbd61f268 Fix typo in mod_roster 
SVN Revision: 1773
 2009-01-05 15:41:53 +00:00
Pablo Polvorin
4827db4f56 Big #jid to binary() conversion. 
Internal tables (ejabberd_router, ejabberd_sm, ejabberd_hooks, mod_last, mod_roster) use binary() as storage.
Basic test using the ODBC backend.

SVN Revision: 1770
 2009-01-03 15:15:38 +00:00
Christophe Romain
1a44fe29b4 PubSub: Added access-whitelist and member-affiliation features (EJAB-780) 
SVN Revision: 1769
 2009-01-03 00:58:18 +00:00
Christophe Romain
e032a8c54f PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix 
SVN Revision: 1767
 2009-01-03 00:29:36 +00:00
Christophe Romain
214ef31053 Improve handling of PEP sent to external contacts (EJAB-825) 
SVN Revision: 1751
 2008-12-23 13:58:38 +00:00
Christophe Romain
978adbbd94 Fix send_last_published_item issue when running on clustered table (EJAB-793) 
SVN Revision: 1741
 2008-12-20 00:01:26 +00:00
Christophe Romain
e6535dcc67 Check option of the nodetree instead of checking configuration 
SVN Revision: 1738
 2008-12-18 13:46:30 +00:00
Pablo Polvorin
d3ddf10839 mod_muc_room.erl: Fix bug in MUC invite. 
SVN Revision: 1736
 2008-12-17 16:24:15 +00:00
Jean-Sébastien Pédron
69805f36fa Merge from trunk (r1730 to r1734). 
PR:		EJABP-1

SVN Revision: 1735
 2008-12-17 13:52:44 +00:00
Jean-Sébastien Pédron
6a3436b1c4 Merge from trunk (r1709 to r1730). 
Ejabberd should be usable again.

PR:		EJABP-1

SVN Revision: 1731
 2008-12-16 13:16:56 +00:00
Jean-Sébastien Pédron
62f9f6e6c5 Convert to exmpp the parts in mod_pubsub recently merged from trunk. 
Warning: Ejabberd is unusable because the rest of trunk hasn't been
merged yet!

PR:		EJABP-1

SVN Revision: 1730
 2008-12-16 10:31:08 +00:00
Christophe Romain
96aaba738b fix get_item_name deadlock on transaction 
SVN Revision: 1729
 2008-12-15 19:58:53 +00:00
Jean-Sébastien Pédron
f83fc51960 Replace stringprep by exmpp_stringprep. 
PR:		EJABP-1

SVN Revision: 1726
 2008-12-10 14:44:08 +00:00
Christophe Romain
44b4c29d08 lattest pubsub merge added in Changelog 
SVN Revision: 1721
 2008-12-09 00:35:27 +00:00
Jean-Sébastien Pédron
3bfb2b5cc1 Merge from trunk (r1692 to r1709). 
PR:		EJABP-1

SVN Revision: 1710
 2008-12-08 12:02:27 +00:00
Jean-Sébastien Pédron
82b97b9639 Finish the conversion of mod_pubsub to Exmpp. 
PR:		EJABP-1

SVN Revision: 1709
 2008-12-08 11:21:32 +00:00
Jean-Sébastien Pédron
d01c24bd23 Fix acl:match_rule/3 call. It takes a #jid record, not a short JID. 
PR:		EJABP-1

SVN Revision: 1708
 2008-12-08 11:20:21 +00:00
Jean-Sébastien Pédron
163d185776 First pass of Exmpp conversion for mod_pubsub. 
CAUTION:
o  Several modules aren't converted yet.
o  Existent Mnesia tables written to disc are not updated.
o  There must be bugs, mostly because of the mix between #jid record
and short JIDs.
PR:		EJABP-1

SVN Revision: 1705
 2008-12-05 15:13:09 +00:00
Jean-Sébastien Pédron
6305ddca18 Add the module and function names to the error message, when a module 
crash.

SVN Revision: 1704
 2008-12-05 15:08:03 +00:00
Jean-Sébastien Pédron
b82b66fdf0 Update Exmpp XML parser options. 
SVN Revision: 1703
 2008-12-05 15:06:49 +00:00
Jean-Sébastien Pédron
b425093813 Convert mod_proxy65 to exmpp. 
SVN Revision: 1701
 2008-12-03 14:34:43 +00:00
Jean-Sébastien Pédron
f30d2b9f1c Fix two warnings about unused variables. 
PR:		EJABP-1

SVN Revision: 1696
 2008-12-01 15:54:57 +00:00
Jean-Sébastien Pédron
9e96043255 Merge from trunk (r1649 to r1692). 
PR:		EJABP-1

SVN Revision: 1695
 2008-12-01 15:53:30 +00:00
Jean-Sébastien Pédron
bd300e870c Convert mod_muc to Exmpp. 
PR:		EJABP-1
Submitted by:	Pablo Polvorin <pablo.polvorin@process-one.net>

SVN Revision: 1692
 2008-12-01 15:01:27 +00:00
Jean-Sébastien Pédron
e06f533f6b Start the exmpp application. 
PR:		EJABP-1
Submitted by:	Pablo Polvorin <pablo.polvorin@process-one.net>

SVN Revision: 1691
 2008-12-01 15:00:36 +00:00
Jean-Sébastien Pédron
7088ba88a9 o In store_last_info/4, fix a bug where the status was not converted to 
list before calling ejabberd_odbc:escape/1.
o  In get_last_info/2, fix a bug where the status was returned as a list
instead of a binary.

SVN Revision: 1690
 2008-12-01 12:16:41 +00:00
Jean-Sébastien Pédron
0313adaec6 Convert to exmpp. 
PR:		EJABP-1

SVN Revision: 1663
 2008-10-20 10:34:00 +00:00
Jean-Sébastien Pédron
50b1e4c36f Convert to exmpp. 
The admin web interface is working but HTTP polling seems broken in the
trunk.

PR:		EJABP-1

SVN Revision: 1654
 2008-10-13 15:36:43 +00:00
Jean-Sébastien Pédron
a94caf218f Remove all deprecated functions from jlib. 
This was accidentally committed with the merge.

PR:		EJABP-1

SVN Revision: 1651
 2008-10-13 11:43:33 +00:00
Jean-Sébastien Pédron
ab2b70f189 Merge from trunk (r1613 to 1649). 
PR:		EJABP-1

SVN Revision: 1650
 2008-10-13 10:11:19 +00:00
Jean-Sébastien Pédron
3190c0ed6c Convert to exmpp. 
PR:		EJABP-1

SVN Revision: 1649
 2008-10-13 09:39:58 +00:00
Jean-Sébastien Pédron
461a5eb315 Convert to exmpp. 
PR:		EJABP-1

SVN Revision: 1648
 2008-10-13 09:39:18 +00:00
Jean-Sébastien Pédron
01ef834b82 Remove the deprecated list of converted modules. 
PR:		EJABP-1

SVN Revision: 1647
 2008-10-13 09:38:34 +00:00
Jean-Sébastien Pédron
0211c8145d Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1. 
PR:		EJABP-1

SVN Revision: 1646
 2008-10-13 09:37:48 +00:00
Jean-Sébastien Pédron
4a9892fa15 Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1 and change the 
error handling.

PR:		EJABP-1

SVN Revision: 1628
 2008-10-10 15:24:47 +00:00
Jean-Sébastien Pédron
71bfefa788 Convert to exmpp. 
PR:		EJABP-1

SVN Revision: 1627
 2008-10-10 15:23:58 +00:00
Jean-Sébastien Pédron
071c858055 Don't start stringprep_sup. 
PR:		EJABP-1

SVN Revision: 1626
 2008-10-10 14:58:35 +00:00
Jean-Sébastien Pédron
0244963935 Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1 and change the 
error handling.

PR:		EJABP-1

SVN Revision: 1625
 2008-10-10 14:57:44 +00:00
Jean-Sébastien Pédron
3adb238b31 Fix a bug where the wrong module was called (jlib instead of exmpp_jid). 
PR:		EJABP-1

SVN Revision: 1624
 2008-10-10 14:41:26 +00:00
Jean-Sébastien Pédron
e3100110f0 Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1 and change the 
error handling.

PR:		EJABP-1

SVN Revision: 1623
 2008-10-10 14:40:04 +00:00
Jean-Sébastien Pédron
5224a796cc Replace jlib:iq_to_xml/1 by exmpp_iq:iq_to_xmlel/1. 
PR:		EJABP-1

SVN Revision: 1622
 2008-10-10 14:38:52 +00:00
Jean-Sébastien Pédron
285b3858dd Replace jlib:*prep/1 by exmpp_stringprep:*prep/1 and change the error 
handling.

PR:		EJABP-1

SVN Revision: 1621
 2008-10-10 14:37:26 +00:00
Jean-Sébastien Pédron
53bea055aa Remove a remaining jlib:jid_remove_resource/1 call. 
PR:		EJABP-1

SVN Revision: 1620
 2008-10-10 14:36:25 +00:00
Jean-Sébastien Pédron
129b0e99cf Replace jlib:nodeprep/1 by exmpp_stringprep:nodeprep/1 and change the 
error handling.

PR:		EJABP-1

SVN Revision: 1619
 2008-10-10 14:35:17 +00:00
Jean-Sébastien Pédron
c0e4af9ac0 Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1 and change the 
error handling.

PR:		EJABP-1

SVN Revision: 1618
 2008-10-10 14:33:16 +00:00
Jean-Sébastien Pédron
ccd94bb734 Fix a buf where a tuple was passed to exmpp_jid:jid_to_list/1 instead of 
a #jid. Now we use exmpp_jid:jid_to_list/3.

PR:		EJABP-1
Submitted by:	Pablo Polvorin <pablo.polvorin@process-one.net>

SVN Revision: 1617
 2008-10-10 08:16:29 +00:00
Jean-Sébastien Pédron
e1b3bd611d Fix a bug where legacy authentication informations were not search among 
the query children but among the IQ children.

PR:		EJABP-1
Submitted by:	Pablo Polvorin <pablo.polvorin@process-one.net>

SVN Revision: 1616
 2008-10-10 08:14:08 +00:00
Jean-Sébastien Pédron
6ab7e339bd Fix handling of unauthenticated stanzas which are not request IQ. 
PR:		EJABP-1
Submitted by:	Pablo Polvorin <pablo.polvorin@process-one.net>

SVN Revision: 1615
 2008-10-09 11:54:42 +00:00
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
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
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
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
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
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
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
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
Jean-Sébastien Pédron
414948d822 VCard are now stored as #xmlel. Mnesia tables are converted during 
startup.

SVN Revision: 1553
 2008-08-27 12:39:49 +00:00
Jean-Sébastien Pédron
02e6bf8759 handle_cast({disco_response, ...}, ...) now receives an #iq record: 
update the code to handle this.

SVN Revision: 1552
 2008-08-27 09:46:25 +00:00
Jean-Sébastien Pédron
8baed08641 Remove a debugging io:format/2. 
SVN Revision: 1551
 2008-08-27 09:45:01 +00:00
Jean-Sébastien Pédron
4e39f4cab1 o Remove compatibility code. Use the atom 'undefined' in JIDs (normal 
and short).
o  Add try/catch blocks where Exmpp can raise exceptions.
o  Remove some unused code.
o  Convert on-disk Mnesia database: JIDs, extra XML elements and
askmessage are concerned.
o  By default, 'askmessage' is now an empty binary instead of an empty
string, for consistency's sake.
o  Fix some bugs.

SVN Revision: 1547
 2008-08-26 13:59:04 +00:00