Badlop
c73e87e9c8
Merge fix from trunk r1910
...
* src/web/ejabberd_http.erl: Added a workaround for inet:peername
returning 'ebadf'
SVN Revision: 1928
2009-02-27 16:19:19 +00:00
Badlop
6482c11f92
* src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
...
and recent Openfire (thanks to Philipp Hancke)(EJAB-877)
SVN Revision: 1926
2009-02-27 15:42:27 +00:00
Badlop
dd5a7bcd54
* doc/guide.tex: No mention to the release date in ejabberd Guide
...
or release notes. The date of an ejabberd release is determined by
the date of the corresponding release announcement.
SVN Revision: 1922
2009-02-26 23:10:28 +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
Pablo Polvorin
2678342c4a
mod_muc/mod_muc_log.erl: The logging code expect nicknames to be in list() format.
...
SVN Revision: 1920
2009-02-24 20:50:28 +00:00
Pablo Polvorin
0f53fea903
src/mod_echo.erl: Fix call to exmpp_xml:get_cdata_as_list/1.
...
SVN Revision: 1919
2009-02-24 20:25:57 +00:00
Pablo Polvorin
31ef821e46
Exmpp related fixed to the external components service.
...
SVN Revision: 1917
2009-02-24 18:52:37 +00:00
Pablo Polvorin
3119badb2b
Removed a couple of expensive function calls used as arguments for
...
?DEBUG macros. All arguments used in the ?DEBUG macro are strictly
evaluated (even if the loglevel is higher).
The same is true for all log macros defined in ejabberd.hrl.
We might need to use lazy evaluation for the arguments, when they
are expensive to generate (wrap the arguments lists in a fun).
SVN Revision: 1915
2009-02-24 03:04:58 +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
Christophe Romain
7a17baccac
Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854)
...
SVN Revision: 1913
2009-02-23 15:58:21 +00:00
Pablo Polvorin
4956259124
src/mod_roster.erl: Bugfix in remove_user/2, values already in binary() format.
...
SVN Revision: 1909
2009-02-21 18:07:37 +00:00
Badlop
a5f70e15a2
* src/ejabberd_auth.erl: Password is undefined when using digest
...
SVN Revision: 1908
2009-02-21 14:41:29 +00:00
Pablo Polvorin
2df100213b
mod_configure: Fix bug in form generation
...
SVN Revision: 1893
2009-02-20 16:34:56 +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
Christophe Romain
edc0a9ac87
fix nodetree plugin resolver, and backport last changes from trunk
...
SVN Revision: 1890
2009-02-19 11:29:01 +00:00
Pablo Polvorin
5334a2d965
Bugfix: mod_announce.erl:get_title/2 now accepts node argument in binary() or list() format.
...
SVN Revision: 1887
2009-02-18 18:14:06 +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
ea62092d6e
src/ejabberd_auth.erl: Fix: for legacy authentication, the Digest parameters could be 'undefined'.
...
src/mod_muc/mod_muc_room.erl: Typo.
src/ejabberd_c2s.erl: Remove comment for an already done TODO.
SVN Revision: 1885
2009-02-18 13:48:06 +00:00
Christophe Romain
e977d099e2
prevent from calling get_vh_registered_users/2 when not available
...
SVN Revision: 1871
2009-02-13 15:01:55 +00:00
Jean-Sébastien Pédron
bf82bac328
o Document the type of the argument(s) and the returned type of every
...
functions.
o Add guardians expression to exported functions to ensure at an early
stage that we were given the right arguments.
o Fix table conversion to exmpp; many fields were left as string(),
preventing matching from working correctly.
o In user_roster_item_parse_query/4, fix a bug where the same variable
was used for two distinct purpose.
o In user_roster_item_parse_query/4, fix a bad usage of
exmpp_jid:jid_to_list/1.
PR: EJABP-1
SVN Revision: 1867
2009-02-06 13:43:40 +00:00
Jean-Sébastien Pédron
25bd2bc7fe
Document the short JID type.
...
PR: EJABP-1
SVN Revision: 1866
2009-02-06 13:35:40 +00:00
Jean-Sébastien Pédron
93b26d947c
Add documentation stub for some types. This will be filled later.
...
PR: EJABP-1
SVN Revision: 1865
2009-02-06 13:34:12 +00:00
Jean-Sébastien Pédron
8290026940
o Document the type of the argument(s) and the returned type of every
...
functions.
o Add guardians expression to many functions of ejabberd_auth and
ejabberd_auth_anonymous to ensure at an early stage that we were given
the right arguments. Other modules are not changed because they are only
used by ejabberd_auth which already does the check.
PR: EJABP-1
SVN Revision: 1863
2009-02-05 11:13:01 +00:00
Jean-Sébastien Pédron
4badd3b6ac
Disable "TODO:" interpretation in eDoc because usually, the following
...
text isn't in eDoc format.
PR: EJABP-1
SVN Revision: 1857
2009-01-30 15:50:13 +00:00
Jean-Sébastien Pédron
69a2194efe
exmpp_server_sasl:next_step/1 returns the mechanism as list() again, so
...
the call to binary_to_list/1 isn't necessary anymore.
PR: EJABP-1
SVN Revision: 1853
2009-01-23 14:06:48 +00:00
Jean-Sébastien Pédron
b5c8b99272
Document every functions to clarify the types to give and returned.
...
PR: EJABP-1
SVN Revision: 1852
2009-01-23 10:10:33 +00:00
Badlop
35926b96b4
* src/odbc/mysql.sql: Fix complain about comment syntax
...
* src/odbc/pg.sql: Likewise
SVN Revision: 1850
2009-01-23 00:10:00 +00:00
Pablo Polvorin
d1cf37bbec
Small fixes
...
SVN Revision: 1849
2009-01-22 22:19:03 +00:00
Jean-Sébastien Pédron
4417608b27
Document every functions to clarify the types to give and returned.
...
PR: EJABP-1
SVN Revision: 1846
2009-01-22 15:54: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
0cf0992f78
Fix some eDoc @spec directives.
...
PR: EJABP-1
SVN Revision: 1844
2009-01-22 15:50:43 +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
376ee2ed90
o In process_iq_get/3 and process_iq_set/3, use binary() version of
...
LUser and LServer.
o In convert_to_exmpp2/2, user and server are stored as binary().
PR: EJABP-1
SVN Revision: 1840
2009-01-21 13:31:14 +00:00
Jean-Sébastien Pédron
2f1397c50e
Use string() version of UserName and UserHost.
...
PR: EJABP-1
SVN Revision: 1839
2009-01-21 13:30:18 +00:00
Jean-Sébastien Pédron
cdbb000638
Return invalid-mechanism when a mechanism isn't supported instead of
...
no-mechanism, which wasn't standard-compliant.
PR: EJABP-1
SVN Revision: 1838
2009-01-21 13:07:55 +00:00
Jean-Sébastien Pédron
8a413018c2
In match_acl/3, use string() version of User/Server/Resource to match an
...
ACL.
PR: EJABP-1
SVN Revision: 1837
2009-01-21 12:44:36 +00:00
Pablo Polvorin
03f2de75f5
Typo (prolists -> proplists).
...
SVN Revision: 1833
2009-01-19 17:45:11 +00:00
Jean-Sébastien Pédron
38c0f3cdc8
Replace remaining calls to deprecated API:
...
o In src/cyrsasl_digest.erl, replace hijacked usage of
xml:get_attr_s/2 by proper calls to proplists:get_value/3.
o Still in src/cyrsasl_digest.erl, replace a call to
stringprep:tolower/1 by exmpp_stringprep:to_lower/1.
o In src/ejabberd_service.erl, replace a call to xml:crypt/1 by
exmpp_xml:escape_using_entities/1.
PR: EJABP-1
SVN Revision: 1832
2009-01-19 15:58:16 +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
Pablo Polvorin
e2ee44617c
translate.erl: Bugfix, ?MYLANG macro returns a list().
...
SVN Revision: 1828
2009-01-19 13:44:43 +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
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