Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-30 23:02:00 +02:00
Code Releases Activity
2,691 Commits 7 Branches 107 Tags 82 MiB
a1fe809197
Commit Graph

174 Commits

Author SHA1 Message Date
Karim Gemayel
d5f2c41f26 API renaming : lnode -> prep_node 
SVN Revision: 2125
 2009-06-01 16:39:36 +00:00
Karim Gemayel
7eb395b87d API renaming : ldomain_as_list -> prep_domain_as_list 
SVN Revision: 2124
 2009-06-01 16:38:28 +00:00
Karim Gemayel
526dc54173 API renaming : parse_jid -> parse 
SVN Revision: 2122
 2009-06-01 16:35:55 +00:00
Karim Gemayel
447d3818f5 API renaming : make_jid -> make 
SVN Revision: 2119
 2009-06-01 16:26:00 +00:00
Christophe Romain
497d4d26bb make flat the default node plugin 
SVN Revision: 2116
 2009-05-29 00:27:26 +00:00
Christophe Romain
a16230c9ca pubsub: added configuration option in guide.tex, added last item cache, use default node type if given type is not configured, make node_flat the default node plugin. caps: improve cache handling 
SVN Revision: 2114
 2009-05-28 23:21:50 +00:00
Christophe Romain
45a8a0fb53 make get_items able to sort items in publish order (EJAB-824) 
SVN Revision: 2105
 2009-05-26 22:50:11 +00:00
Christophe Romain
aa210166c4 improve get_entity_* to work regardless of nodetree (EJAB-937) 
SVN Revision: 2104
 2009-05-26 21:50:13 +00:00
Christophe Romain
2e26b6bf8b PubSub: improve get_entity_* API 
SVN Revision: 2091
 2009-05-19 22:29:28 +00:00
Christophe Romain
c12b1870b7 Fix bad transaction returncode in unsubscribe presence handler 
SVN Revision: 2074
 2009-05-12 21:00:05 +00:00
Christophe Romain
fd36726357 Prevent race condition when calling get_caps while note_caps has not been handled yet (EJAB-934) 
SVN Revision: 2072
 2009-05-11 17:27:55 +00:00
Christophe Romain
8dc1bb0659 handle Example 90 of XEP-0060 (EJAB-909), and make use of nodeAttr 
SVN Revision: 2069
 2009-05-08 01:28:17 +00:00
Christophe Romain
38413dc236 Allow to get subscriptions on a given node (EJAB-712), and presence based fixes 
SVN Revision: 2067
 2009-05-08 00:02:08 +00:00
Christophe Romain
e40e4298ca several pubsub fixes and improvements. also fixes EJAB-913 and EJAB-871 
SVN Revision: 2061
 2009-05-07 00:54:44 +00:00
Christophe Romain
ced30acb20 backport pubsub/pep/caps optimizations from trunk 
SVN Revision: 2052
 2009-04-30 23:17:38 +00:00
Christophe Romain
fd5e312ed9 minor cosmetic fix 
SVN Revision: 2040
 2009-04-24 21:34:59 +00:00
Christophe Romain
6710d66a58 fix minor pubsub init glitch, and allow ejabberd_odbc to execute bloc of queries without transaction 
SVN Revision: 2039
 2009-04-24 10:32:41 +00:00
Christophe Romain
1d44abfc8a improve send last published items spawning 
SVN Revision: 2037
 2009-04-22 23:01:51 +00:00
Christophe Romain
08cbaf8ccf Better handling of presence hook and caps clean 
SVN Revision: 2015
 2009-04-10 13:21:37 +00:00
Badlop
854b448536 * src/mod_pubsub/mod_pubsub.erl: Announce PubSub features in the 
server JID only if PEP is enabled (EJAB-905)

SVN Revision: 2010
 2009-04-08 19:30:24 +00:00
Badlop
d13be09524 * src/mod_pubsub/mod_pubsub.erl: Quickfix compilation errors. 
SVN Revision: 2008
 2009-04-08 18:58:11 +00:00
Christophe Romain
3e756f5d1c implement roster acces model (EJAB-780) 
SVN Revision: 1997
 2009-03-20 00:08:38 +00:00
Christophe Romain
2c4effe6ce typo fix on roster access_model 
SVN Revision: 1985
 2009-03-10 12:09:31 +00:00
Christophe Romain
5ed381fc58 Fix PEP with other domains and s2s (EJAB-825) 
SVN Revision: 1982
 2009-03-10 11:13:46 +00:00
Christophe Romain
ab2dc5877f Allow node creation without configure item 
SVN Revision: 1964
 2009-03-04 01:14:13 +00:00
Christophe Romain
592c98fd7a update pubsub version 
SVN Revision: 1961
 2009-03-04 01:04:51 +00:00
Christophe Romain
facf17e689 Add roster subscriptions handling and make PEP events sent to all resources 
SVN Revision: 1958
 2009-03-03 23:26:07 +00:00
Badlop
34f6de0c84 * src/mod_pubsub/mod_pubsub.erl: Fix incorrect implementation of 
Pubsub payload requirements (thanks to Andy Skelton)(EJAB-823)

SVN Revision: 1921
 2009-02-25 21:17:14 +00:00
Christophe Romain
edc0a9ac87 fix nodetree plugin resolver, and backport last changes from trunk 
SVN Revision: 1890
 2009-02-19 11:29:01 +00:00
Jean-Sébastien Pédron
842ebfcca0 A lot of bug fixes regarding attribute values type: 
o  Fix some bugs by getting attributes as list() instead of binary().
o  Instead creating #xmlattr directly, use the new ?XMLATTR macro; it'll
take care of the anything-to-binary() conversion.
o  Fix a bug where recipient and sender were used as binary() instead of
list(), which is required by the rest of the S2S code.
o  Fix a bug where binary_to_list/1 was called on a list().

Now concerning JIDs :
o  Now that #jid{} isn't part of the API of Exmppp anymore, replace
remaining direct usages by calls to exmpp_jid.
o  Replace exmpp_jid:make_bare_jid() by exmpp_jid:make_jid().
o  Replace exmpp_jid:*_to_jid/1 by exmpp_jid:parse_jid/1.

PR:		EJABP-1

SVN Revision: 1841
 2009-01-21 13:34:26 +00:00
Jean-Sébastien Pédron
fc77b48344 Merge from trunk (r1804 to r1829). 
The merge party is over, you may now double-check that everything is in
place.

PR:		EJABP-1

SVN Revision: 1830
 2009-01-19 15:27:07 +00:00
Jean-Sébastien Pédron
ff500d8297 Merge from trunk (r1787 to r1804). 
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.

Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1766, r1768, r1781, r1783, r1794, r1797, r1799, r1802.

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

PR:		EJABP-1

SVN Revision: 1829
 2009-01-19 14:47:33 +00:00
Jean-Sébastien Pédron
25009ff9f4 Merge from trunk (r1764 to r1787). 
Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1827
 2009-01-19 11:59:40 +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
96c0ff44f9 Fix typo 
SVN Revision: 1806
 2009-01-12 15:51:22 +00:00
Christophe Romain
56bccce713 fix previous fix misplacing (EJAB-840) 
SVN Revision: 1803
 2009-01-11 06:24:42 +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
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
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
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
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
Christophe Romain
e1575e3177 fix typo bug injected in r1712 
SVN Revision: 1725
 2008-12-09 22:42:34 +00:00
Christophe Romain
3d28a7837d minor bugfix 
SVN Revision: 1723
 2008-12-09 22:09:30 +00:00
Christophe Romain
9f2fda6060 merge to lattest trunk r1716 
SVN Revision: 1720
 2008-12-09 00:32:36 +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
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
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
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
4eaa8e19c9 Merge from trunk (r1457 to r1563). 
SVN Revision: 1564
 2008-09-16 14:39:57 +00:00
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
Christophe Romain
fe82bf3e81 temporary roster_groups_allowed (EJAB-655) 
SVN Revision: 1359
 2008-06-18 16:35:03 +00:00
Christophe Romain
638d789ae6 pubsub get_default bugfix (EJAB-656) 
SVN Revision: 1358
 2008-06-18 16:19:18 +00:00
Christophe Romain
edf1ed5c87 remove unused served_hosts option 
SVN Revision: 1306
 2008-04-28 13:02:07 +00:00
Christophe Romain
367610dd38 pubsub identity and database update bugfix 
SVN Revision: 1285
 2008-04-10 14:11:06 +00:00
Christophe Romain
37fc28ef49 add condition inclusion of pep in disco identity (EJAB-564) 
SVN Revision: 1268
 2008-04-02 09:06:28 +00:00
Badlop
5fd627b85b * doc/api/Makefile: Report the correct ejabberd version. When 
cleaning, remove also erlang.png

* src/mod_muc/mod_muc_room.erl: Update source code to prevent
warning messages from EDoc
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_pubsub/node_default.erl: Likewise
* src/mod_pubsub/nodetree_default.erl: Likewise
* src/mod_pubsub/nodetree_virtual.erl: Likewise
* src/mod_pubsub/pubsub.hrl: Likewise

SVN Revision: 1265
 2008-04-01 10:11:39 +00:00
Christophe Romain
1247a98cf2 Pubsub subscription is now wrapped in pubsub tags (EJAB-580) 
SVN Revision: 1244
 2008-03-21 16:05:32 +00:00
Christophe Romain
7f6cdc6cfe use if event instead of x when xmlns is pubsub#event (EJAB-518) 
SVN Revision: 1181
 2008-02-11 15:21:24 +00:00
Mickaël Rémond
4e096f1590 * src/mod_pubsub/gen_pubsub_node.erl: API improvement: Added a way to generate custom item name 
* src/mod_pubsub/node_dispatch.erl: Likewise
* src/mod_pubsub/node_buddy.erl: Likewise
* src/mod_pubsub/node_private.erl: Likewise
* src/mod_pubsub/node_club.erl: Likewise
* src/mod_pubsub/node_public.erl: Likewise
* src/mod_pubsub/node_default.erl: Likewise
* src/mod_pubsub/node_pep.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Small API improvements and refactoring

SVN Revision: 1173
 2008-02-06 18:04:23 +00:00
Mickaël Rémond
fff45aca21 * src/mod_pubsub/mod_pubsub.erl: Added the from field in the 
get_subnodes pubsub plugin API function. This is usefull to write
plugins to generate the pubsub hierarchy dynamically, based on who
is doing the browsing request.
* src/mod_pubsub/gen_pubsub_nodetree.erl: Likewise
* src/mod_pubsub/nodetree_default.erl: Likewise
* src/mod_pubsub/nodetree_virtual.erl: Likewise

SVN Revision: 1168
 2008-02-02 14:15:37 +00:00
Christophe Romain
c8e580987d pubsub dirty_sync typo fix on node configuration transaction 
SVN Revision: 1159
 2008-01-25 10:17:59 +00:00
Christophe Romain
58c491ade3 pubsub configuration patch (EJAB-508) and (EJAB-509) 
SVN Revision: 1158
 2008-01-25 09:24:10 +00:00
Badlop
2d2fcc8210 * doc/guide.tex: Updated copyright dates to 2008 
* src/*: Likewise

SVN Revision: 1153
 2008-01-15 17:02:57 +00:00
Christophe Romain
aa685c7794 set_subscription fix (EJAB-494) 
SVN Revision: 1148
 2008-01-12 19:47:19 +00:00
Christophe Romain
20c27ea9d9 EJAB-491 fix 
SVN Revision: 1145
 2008-01-11 01:39:10 +00:00
Christophe Romain
b3bf437dd1 Send last published PEP event now checks the correct peer caps (EJAB-491) 
SVN Revision: 1143
 2008-01-10 15:02:54 +00:00
Mickaël Rémond
22f928122f * Applied copyright patch 3. 
SVN Revision: 1113
 2007-12-24 13:57:53 +00:00
Christophe Romain
56194f742b pubsub: remove useless get_roster_info call 
SVN Revision: 1109
 2007-12-24 11:28:56 +00:00
Christophe Romain
1f8c32cbff debug log fix 
SVN Revision: 1098
 2007-12-22 01:14:56 +00:00
Christophe Romain
d74c527101 EJAB-469 bugfix 
SVN Revision: 1097
 2007-12-22 01:13:06 +00:00
Christophe Romain
02eaf9eaec several pubsub/pep bugfix 
SVN Revision: 1096
 2007-12-22 00:04:05 +00:00
Christophe Romain
e7fda4a23f pubsub disco#items bugfix (EJAB-465) 
SVN Revision: 1089
 2007-12-21 00:08:59 +00:00
Christophe Romain
583f2fd19f PEP notification bugfix 
SVN Revision: 1085
 2007-12-20 16:38:38 +00:00
Christophe Romain
c0b2c5744f Purge related pep nodes at remove_user 
SVN Revision: 1077
 2007-12-18 14:45:26 +00:00
Badlop
090fceebc2 * src/mod_irc/mod_irc.erl: No need to translate copyright notice 
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_vcard.erl: Likewise
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard_odbc.erl: Likewise
* src/msgs/*.msg: Likewise

* contrib/extract_translations/prepare-translation.sh: Bugfix

SVN Revision: 1071
 2007-12-15 12:02:00 +00:00
Christophe Romain
348427fab0 pubsub presence handler bugfix 
SVN Revision: 1068
 2007-12-12 16:16:00 +00:00
Christophe Romain
f3322710c0 pubsub notification broadcast bugfix 
SVN Revision: 1065
 2007-12-11 16:19:17 +00:00
Christophe Romain
bf239fac9d auto-create pe node bugfix 
SVN Revision: 1060
 2007-12-10 14:09:31 +00:00
Christophe Romain
b9286778d4 return back to good location for database upgrade call 
SVN Revision: 1059
 2007-12-10 09:56:15 +00:00
Christophe Romain
d4ff7eeb4a pubsub database upgrade bugfix 
SVN Revision: 1058
 2007-12-10 09:33:30 +00:00
Christophe Romain
23b91e953a pubsub disco_sm_items bugfix 
SVN Revision: 1051
 2007-12-08 15:24:38 +00:00
Badlop
95c69b0251 * src/mod_irc/iconv.erl: Fix compilation warnings: 3 (EJAB-290) 
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_irc/mod_irc_connection.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/stringprep/stringprep.erl: Likewise
* src/web/ejabberd_http.erl: Likewise
* src/web/ejabberd_http_poll.erl: Likewise

SVN Revision: 1047
 2007-12-07 00:48:11 +00:00
Badlop
d3a86d7660 * src/mod_pubsub/mod_pubsub.erl: Fixed URI. 
SVN Revision: 1020
 2007-12-04 21:35:41 +00:00
Badlop
1724ee2b15 * src/mod_pubsub/mod_pubsub.erl: Bugfix: don't report the Jabber 
server as a pubsub service.

SVN Revision: 1019
 2007-12-04 11:38:00 +00:00
Alexey Shchepin
c3c782d882 * src/mod_caps.erl: CAPS support (thanks to Magnus Henoch) 
* src/ejabberd_local.erl: Support for IQ responses
* src/jlib.erl: Added iq_query_or_response_info/1 function
* src/jlib.hrl: Added NS_PUBSUB_ERRORS and NS_CAPS

* src/mod_pubsub/Makefile.in: New pubsub+pep implementation
(thanks to Christophe Romain and Magnus Henoch)
* src/ejabberd_sm.erl: Added get_session_pid/3 function
* src/ejabberd_c2s.erl: Added get_subscribed_and_online/1 function

SVN Revision: 1004
 2007-12-01 05:16:30 +00:00
Badlop
0996e569a6 * doc/guide.tex: Update URI of ejabberd official home page, URI 
of ejabberd.jabber.ru, and copyright dates (EJAB-366)
* doc/introduction.tex: 
* src/ejabberd.hrl: 
* src/ejabberd_admin.erl: 
* src/mod_irc/mod_irc.erl: 
* src/mod_irc/mod_irc_connection.erl: 
* src/mod_muc/mod_muc.erl: 
* src/mod_muc/mod_muc_log.erl: 
* src/mod_proxy65/mod_proxy65_service.erl: 
* src/mod_pubsub/mod_pubsub.erl: 
* src/mod_vcard.erl: 
* src/mod_vcard_ldap.erl: 
* src/mod_vcard_odbc.erl: 
* src/msgs/*.msg: 
* src/web/ejabberd_web_admin.erl:

SVN Revision: 997
 2007-11-27 23:35:26 +00:00
Alexey Shchepin
5dfa6edda3 * src/gen_mod.erl: Substitute @HOST@ with hostname in the 'host' 
option (thanks to Badlop)
* src/mod_vcard.erl: Likewise
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard_odbc.erl: Likewise
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_echo.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise

SVN Revision: 888
 2007-08-25 17:24:00 +00:00
Mickaël Rémond
03740c8bca * src/mod_vcard.erl: Make services description translatable in discovery (EJAB-236 - thanks to Badlop) 
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
* src/msgs/fr.msg: Added service description translation

SVN Revision: 774
 2007-05-29 13:14:09 +00:00
Alexey Shchepin
39c1eb4be7 * src/mod_pubsub/mod_pubsub.erl: Bugfix 
SVN Revision: 737
 2007-02-22 07:39:05 +00:00
Christophe Romain
cf3ec810d5 support presence_delivery in cluster 
SVN Revision: 702
 2007-01-09 10:09:51 +00:00
Mickaël Rémond
112c609222 * src/mod_muc/mod_muc.erl: Component name is now more user 
friendly (thanks to Badlop).
* src/mod_irc/mod_irc.erl: Likewise.
* src/mod_pubsub/mod_pubsub.erl: Likewise.

SVN Revision: 620
 2006-09-22 17:01:16 +00:00