Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00
Code Releases Activity
3,301 Commits 7 Branches 109 Tags 65 MiB
7d3633e91c
Commit Graph

127 Commits

Author SHA1 Message Date
Badlop
fef8c3a1f3 New option resource_conflict defines server action (thanks to Lee Boynton)(EJAB-650) 2011-08-17 19:44:56 +02:00
Christophe Romain
4a2005f7cc update copyright up to 2011 2011-02-14 13:47:22 +01:00
Christophe Romain
2f681b05f3 refactor pubsub broadcast to allow large optimization 2011-02-08 19:08:38 +01:00
Pablo Polvorin
ef572c815f Port to latest exmpp changes (attribute names as binary()). 
All atributes are now binary() instead of atoms.
 2010-11-29 16:44:31 -03:00
Badlop
82a8dc7b3a Cosmetic code changes to support emacs indentation 2010-10-07 17:38:18 +02:00
Badlop
645ddcb749 Fix unused variables 2010-10-05 15:48:11 +02:00
Badlop
89a98be605 Display priority, login time, pid and pid info in webadmin (EJAB-1300) 2010-09-13 17:49:55 +02:00
Badlop
cdb379a22c Patch core for MH (thanks to Alexey Shchepin and Geoff Cant) 2010-07-23 00:29:28 +02:00
Badlop
67da88f0bd Improve ejabberd's broadcast stanzas to satisfy #xmlel type 2010-06-18 21:24:51 +02:00
Badlop
e27dda3ff1 Fix for Erlang R12, that doesn't support: true andalso ok 2010-06-15 23:01:13 +02:00
Evgeniy Khramtsov
2187bccc38 consistent hashing support. WARNING: update exmpp before running this 2010-06-03 00:01:36 +10:00
Badlop
4c147c5f29 Don't store blocked messages in offline queue (thanks to Brian Acton)(EJAB-1224) 2010-04-27 13:29:05 +02:00
Badlop
9820880cd5 Automatic vcard avatar addition in presence (thanks to Igor Goryachev)(EJAB-208) 2010-04-27 12:33:38 +02:00
Badlop
5a82e3ac70 Rewrite mnesia counter functions to use dirty_update_counter (EJAB-1177) 
(thanks to Juan Pablo Carlino and Alexey Shchepin)
 2010-02-15 23:38:08 +01:00
Badlop
887a65aa18 exmpp in pubsub doc and retrocompatibility comments (thanks to Karim Gemayel) 
SVN Revision: 2934
 2010-01-27 18:53:56 +00:00
Badlop
1bcd481fdc Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 
SVN Revision: 2892
 2010-01-12 16:15:16 +00:00
Christophe Romain
2078f9ae95 typo fix on mod_pubsub and improve ejabberd_sm:get_session_pid api 
SVN Revision: 2715
 2009-10-27 14:40:01 +00:00
Badlop
8d988d1bd2 Store account number in internal auth of (EJAB-981)(thanks to Juan Pablo Carlino) 
SVN Revision: 2366
 2009-07-17 19:06:42 +00:00
Karim Gemayel
29c0e17ca2 API renaming : lresource -> prep_resource 
SVN Revision: 2127
 2009-06-01 16:42:07 +00:00
Karim Gemayel
d51d9e9fff API renaming : lnode_as_list -> prep_node_as_list 
SVN Revision: 2126
 2009-06-01 16:40:51 +00:00
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
19d7d79229 API renaming : ldomain -> prep_domain 
SVN Revision: 2123
 2009-06-01 16:37:15 +00:00
Karim Gemayel
a136192db2 API renaming : bare_jid_to_jid -> full 
SVN Revision: 2121
 2009-06-01 16:34:38 +00:00
Karim Gemayel
5dbc4f9954 API renaming : jid_to_bare_jid > bare 
SVN Revision: 2120
 2009-06-01 16:30:15 +00:00
Karim Gemayel
447d3818f5 API renaming : make_jid -> make 
SVN Revision: 2119
 2009-06-01 16:26:00 +00:00
Badlop
61691ac47d Merge 1998 from trunk. 
* src/ejabberd_sm.erl: Partially retract SVN r1976
EJAB-300 (EJAB-890). Check default privacy list when account, not
a specific session, receives a presence subscription
stanza (EJAB-300).
* src/ejabberd_c2s.erl: Likewise

SVN Revision: 1999
 2009-03-24 18:02:13 +00:00
Badlop
56c33e994d * src/ejabberd_c2s.erl: Enforce privacy rules also for 
subscription requests (EJAB-300)
* src/ejabberd_sm.erl: Likewise

SVN Revision: 1976
 2009-03-07 08:59:26 +00:00
Pablo Polvorin
7c10f3422a src/web/ejabberd_web_admin.erl, src/web/ejabberd_web_admin.hrl: 
Many exmpp related fixes. Fix a bug when displaying users lists, 
if we can't access the 'offline_msg' mnesia table (using mod_offline_odbc).
This fix should be temporal, we should find a better way to manage this
situation.

src/web/ejabberd_http.erl: Language must be in binary() format.

src/translate.erl: Remove a debug call to io:format/2.

src/ejabberd_sm.erl, src/mod_configure.erl, src/mod_disco.erl:
ejabberd_sm:get_user_resources/2 returns resources as binary().

src/ejabberd_sm.erl: Bugfix in get_user_info/3.

SVN Revision: 1886
 2009-02-18 18:03:11 +00:00
Pablo Polvorin
d1cf37bbec Small fixes 
SVN Revision: 1849
 2009-01-22 22:19:03 +00:00
Jean-Sébastien Pédron
a105dcb060 In get_vh_session_list/1, remove a bad list_to_binary/1; now that 
exmpp_stringprep return the correct type, it was used on a binary().

PR:		EJABP-1

SVN Revision: 1845
 2009-01-22 15:52:30 +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
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
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
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
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
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
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
4eaa8e19c9 Merge from trunk (r1457 to r1563). 
SVN Revision: 1564
 2008-09-16 14:39:57 +00:00
Jean-Sébastien Pédron
9f0d79da9a o Use the new functions from jlib. 
o  Remove the compatibility code. It's becoming confusing to handle every
case every where. Also, in JIDs (normal and short), the atom "undefined'
is expected, not the empty string anymore!

SVN Revision: 1546
 2008-08-26 13:38:49 +00:00
Jean-Sébastien Pédron
5e78c53572 Remove the compatibility layer and always call modules with the new #iq 
record from Exmpp.

SVN Revision: 1523
 2008-08-14 13:34:30 +00:00
Jean-Sébastien Pédron
07b1210b50 Merge revisions from 1444 to revision 1457 from trunk. 
SVN Revision: 1458
 2008-07-17 15:33:50 +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
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
094fa47f9f Convert gen_iq_handler to exmpp. 
SVN Revision: 1401
 2008-07-01 10:21:35 +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
87218e1447 Convert to exmpp. 
SVN Revision: 1393
 2008-07-01 07:49:57 +00:00
Christophe Romain
b2bd9759c8 Rewrite io:format calls to loglevel macros (EJAB-555) 
SVN Revision: 1239
 2008-03-21 14:44:16 +00:00
Christophe Romain
04d688c1ba Retreive connection type in sm_register_connection_hook 
SVN Revision: 1194
 2008-02-15 16:35:32 +00:00