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
1,567 Commits 7 Branches 109 Tags 65 MiB
9bcba6c8b8
Commit Graph

60 Commits

Author SHA1 Message Date
Badlop
23ec55975e Merge 1877 from trunk. 
* src/mod_roster.erl: When account is deleted, cancel presence
subscription for all roster items (EJAB-790)
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 1943
 2009-03-03 18:57:47 +00:00
Pablo Polvorin
acae6e20de * Use exmpp_jid:to_binary/1 when possible. 
* ejabberd_odbc:escape/1 now can escape binaries too. This 
avoid the need to convert a binary value to list() just to 
sql-escape it. The escaped value returned is allways a list() 
(ejabberd's odbc drivers only works on lists())

SVN Revision: 1914
 2009-02-23 19:45:55 +00:00
Pablo Polvorin
e989d41d50 "remove_user" hook actualized to expect binary arguments. 
Fix webadmin code that performs addition / removal  of users.

SVN Revision: 1892
 2009-02-20 15:30:16 +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
Jean-Sébastien Pédron
bc51bd0dbd Merge from trunk (r1752 to r1764). 
Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1826
 2009-01-19 11:16:44 +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
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
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
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
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
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
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
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
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
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
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
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
574dbbfd08 Merge revisions from 1434 to revision 1444 from trunk. 
SVN Revision: 1445
 2008-07-15 08:45:05 +00:00
Alexey Shchepin
8283a9faf3 * src/mod_roster.erl: Fixed "from" attribute in roster pushes 
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 1213
 2008-02-28 22:10:55 +00:00
Alexey Shchepin
08a4392fa9 * src/mod_roster.erl: Removed the ancient Psi roster workaround 
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 1189
 2008-02-14 04:51:04 +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
Mickaël Rémond
cd82cadd10 * applied copyright patch 2. 
SVN Revision: 1112
 2007-12-24 12:58:05 +00:00
Alexey Shchepin
a8bc3a46af * src/web/ejabberd_web_admin.erl: Moved roster stuff to mod_roster* 
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 886
 2007-08-24 16:15:05 +00:00
Alexey Shchepin
3f92fb1acc * src/mod_roster.erl: Don't send roster push when unsubscribing in 
"None + Pending In" state
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 882
 2007-08-20 18:57:11 +00:00
Mickaël Rémond
888acbdb2e * src/mod_roster_odbc.erl: Better error management when bad JID in roster table (EJAB-289). 
SVN Revision: 835
 2007-07-28 09:36:37 +00:00
Mickaël Rémond
54a5b2d3e9 * src/mod_roster_odbc.erl: Fixed wrong call. 
SVN Revision: 824
 2007-07-26 08:30:25 +00:00
Alexey Shchepin
697566476f * src/mod_roster_odbc.erl: Fixed typo 
SVN Revision: 782
 2007-06-12 16:44:15 +00:00
Alexey Shchepin
a10923c197 * src/ejabberd_auth_anonymous.erl: Added anonymous_purge_hook 
(thanks to Christophe Romain and Mickael Remond)
* src/mod_offline.erl: Likewise
* src/mod_offline_odbc.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 765
 2007-05-12 16:28:34 +00:00
Alexey Shchepin
1e5a9d9f43 * src/mod_roster_odbc.erl: Don't deliver roster items in "None + 
Pending In" state
* src/mod_roster.erl: Likewise

SVN Revision: 752
 2007-04-26 14:45:16 +00:00
Alexey Shchepin
a365f8cd2b * src/mod_roster_odbc.erl: Bugfix (thanks to asdx 
<asdx@jabber.snc.ru>)
* src/ejd2odbc.erl: Likewise

SVN Revision: 717
 2007-01-30 15:23:48 +00:00
Alexey Shchepin
e9047f4b31 * src/mod_roster_odbc.erl: Better error handling 
* src/web/ejabberd_http_poll.erl: Minor fix

SVN Revision: 690
 2006-12-07 02:56:14 +00:00
Alexey Shchepin
4d7cc9301a * src/ejabberd_socket.erl: All XML socket operations moved here 
* src/ejabberd_listener.erl: Updated
* src/ejabberd_receiver.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise

* src/mod_shared_roster.erl: Bugfix

* src/mod_roster_odbc.erl: Bugfix

SVN Revision: 599
 2006-09-05 04:26:28 +00:00
Mickaël Rémond
d0e2ac9ed2 * src/odbc/odbc_queries.erl: Support for Microsoft SQL Server as 
a database backend (via ODBC).
* src/odbc/ejabberd_odbc.erl: Likewise.
* src/odbc/mssql.sql: Likewise.
* src/odbc/Makefile.in: Likewise.
* src/ejabberd_auth_odbc.erl: Likewise.
* src/mod_offline_odbc.erl: Likewise.
* src/mod_roster_odbc.erl: Likewise.
* src/mod_last_odbc.erl: Likewise.
* src/configure.ac: Likewise
* doc/guide.tex: Likewise.
* doc/introduction.tex: Likewise.
* src/odbc/pg.sql: Minor fix.

SVN Revision: 598
 2006-09-03 15:15:46 +00:00
Alexey Shchepin
ab2e19a399 * src/mod_roster_odbc.erl: Bugfix 
SVN Revision: 591
 2006-08-01 23:32:56 +00:00
Mickaël Rémond
a166203194 * src/mod_shared_roster.erl: Shared roster entries can now be 
moved or rename from a client without breaking current presence status
(EJAB-70).
* src/mod_roster.erl: Likewise.
* src/mod_roster_odbc.erl: Likewise.

SVN Revision: 586
 2006-07-06 14:08:09 +00:00
Mickaël Rémond
ce5d10eb59 * src/mod_roster.erl: According to RFC3921 section 9.2, outbound 
subscribe presence packets must be sent, even if the user has already
asked for subcription previously (subscription: none and pending: out).
The mod_roster now conforms to this behaviour (EJAB-102).
* src/mod_roster_odbc.erl: Likewise.

SVN Revision: 574
 2006-05-29 16:48:20 +00:00
Alexey Shchepin
c737ce1b8c * src/odbc/pg.sql: Updated 
* src/mod_shared_roster.erl: Updated

* src/ejabberd_sm.erl: Bugfix

* src/mod_roster.erl: Bugfix
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 570
 2006-05-26 00:00:32 +00:00
Mickaël Rémond
42cdf80cd4 * src/mod_roster.erl: The subscribe request are now resend at 
login as long as they have not been answered. mod_roster do no more
depends on mod_offline.
* src/ejabberd_sm.erl: Likewise.
* src/ejabberd_c2s.erl: Likewise.
* src/mod_roster_odbc.erl: Likewise (The ODBC/relational support
has not yet been tested).
* src/mod_roster.hrl: Likewise.
* src/mod_offline.erl: Likewise.
* src/mod_offline_odbc.erl: Likewise.
* odbc/pg.sql: Likewise.
* odbc/mysql.sql: Likewise.

SVN Revision: 569
 2006-05-23 20:19:37 +00:00
Alexey Shchepin
73073d4af5 * src/mod_roster_odbc.erl: Bugfix 
SVN Revision: 504
 2006-02-12 18:40:03 +00:00
Alexey Shchepin
6eac737807 * src/mod_roster_odbc.erl: Bugfix 
SVN Revision: 503
 2006-02-11 23:55:21 +00:00
Alexey Shchepin
ef0b3ab24c * src/mod_roster_odbc.erl: Bugfix 
SVN Revision: 490
 2006-01-24 21:47:53 +00:00
Mickaël Rémond
559b5cae14 * src/odbc/mysql.sql: Database description for MySQL Database 
4.1 (Max version, with Innodb)
* src/ejabberd_auth_odbc.erl: MySQL ODBC support.
* src/mod_offline_odbc.erl: likewise
* src/mod_vcard_odbc.erl: likewsie
* src/mod_roster_odbc.erl: likewise
* src/odbc/ejabberd_odbc.erl: likewise
* src/mod_last_odbc.erl: likewise

SVN Revision: 474
 2005-12-21 16:10:56 +00:00
Alexey Shchepin
626394044d * src/mod_roster.erl: Workaround for gateway subscriptions now 
should be enabled with --enable-roster-gateway-workaround
* src/mod_roster_odbc.erl: Likewise
* src/configure.ac: Likewise
* src/Makefile.in: Likewise

SVN Revision: 459
 2005-12-11 19:48:31 +00:00
Alexey Shchepin
816d5474f8 * src/mod_roster.erl: The "id" attribute of roster push packet was 
missed (thanks to Maxim Ryazanov)
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 442
 2005-11-22 18:43:06 +00:00