Badlop
79463d7f7d
Merge 1873 from trunk.
...
* src/web/ejabberd_web_admin.erl: Show big integers with comma
separators for easy reading
SVN Revision: 1939
2009-03-03 18:29:53 +00:00
Badlop
77ff657351
Merge 1859 from trunk.
...
* src/web/ejabberd_web_admin.erl: Calls to the hook
webadmin_menu_node provide the node as first argument, and calls
to webadmin_menu_hostnode provide both the host and the node. Fix
call to make_menu_items, because webadmin_menu_node was called in
cases where webadmin_menu_hostnode should be called. Align to
right some table elements.
SVN Revision: 1938
2009-03-03 18:24:42 +00:00
Badlop
85412f0a41
Merge from trunk: 1835, 1836, 1842, 1843, 1854, 1858, 1860, 1861, and 1862.
...
* doc/Makefile: In Clean do not remove html. In new Distclean,
remove also html.
* doc/Makefile: When cleaning, remove contributed_modules.tex
* src/Makefile.in: Fix arguments to Install program
* doc/guide.tex: Provide only an example of language option
* doc/guide.html: Likewise
* doc/guide.tex: mod_muc can run in several nodes of cluster
* doc/guide.html: Likewise
* doc/api/process-one.css: Add some style to HTML elements
* src/ejabberd_listener.erl: Fix EDoc errors
* src/web/ejabberd_web_admin.erl: Likewise
* src/ejabberd_hooks.erl: Explanation in EDoc of some functions
* doc/guide.tex: Explain that account creation is only supported
by internal and odbc authentication methods
* doc/guide.html: Likewise
* src/Makefile.in: The path to the installed copy of ejabberd
Guide is set in the environment variable
EJABBERD_DOC_PATH (EJAB-837).
* src/web/ejabberd_web_admin.erl: Likewise
* src/ejabberdctl.template: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1937
2009-03-03 18:11:23 +00:00
Pablo Polvorin
54a6992ae0
Serialize s2s stanzas to iolist() rather than list()
...
SVN Revision: 1936
2009-03-02 15:48:01 +00:00
Pablo Polvorin
2c35514537
Correct include declaration (thanks to badlop). Bug was introduced in r1863
...
SVN Revision: 1935
2009-03-02 13:27:35 +00:00
Pablo Polvorin
7fea7b30b2
Elements and namespace for (XEP-0039) aren't know by exmpp (" http://jabber.org/protocol/stats " is represented as a list())
...
SVN Revision: 1934
2009-03-01 20:48:43 +00:00
Pablo Polvorin
f0d55c9a3f
Fix bug when clients connect using legacy ssl
...
(ejabberd_receiver:process_data/2 was called before initializing the xmlstream).
SVN Revision: 1933
2009-03-01 20:18:42 +00:00
Pablo Polvorin
3336d66fc4
Host argument for ejabberd_hooks's functions must be in binary() format.
...
SVN Revision: 1932
2009-03-01 19:03:35 +00:00
Badlop
117b67a31c
Fix small compilation error introduced in revision 1923
...
SVN Revision: 1931
2009-02-28 00:01:27 +00:00
Badlop
19d27258d9
* src/mod_pubsub/node_default.erl: Fix that non-subscriber could
...
fetch items from Authorize node (thanks to Brian Cully)(EJAB-873)
SVN Revision: 1930
2009-02-27 23:56:46 +00:00
Badlop
64f2945892
* src/mod_pubsub/node_default.erl: Fix that non-subscriber could
...
fetch items from Authorize node (thanks to Brian Cully)(EJAB-873)
SVN Revision: 1930
2009-02-27 23:56:46 +00:00
Pablo Polvorin
58e4b98d61
Fix small bug introduced in revision 1924.
...
SVN Revision: 1929
2009-02-27 21:09:44 +00:00
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
3a5fb440cc
* 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
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
Evgeniy Khramtsov
b766109f66
* src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not defined, the module takes an IP address of a local hostname.
...
SVN Revision: 1925
2009-02-27 03:22:40 +00:00
Christophe Romain
f4a952032a
cosmetic changes
...
SVN Revision: 1924
2009-02-27 03:19:53 +00:00
Christophe Romain
67e24366ee
cosmetic changes
...
SVN Revision: 1923
2009-02-27 03:09:00 +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
c5c97a8edf
* 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
Badlop
fd26056d01
* 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
9b1e5928bd
Remove unused var
...
SVN Revision: 1918
2009-02-24 20:07:32 +00:00
Pablo Polvorin
31ef821e46
Exmpp related fixed to the external components service.
...
SVN Revision: 1917
2009-02-24 18:52:37 +00:00
Badlop
1650a946f2
* src/ejabberd_listener.erl: Fix report message of 'undef' error
...
SVN Revision: 1916
2009-02-24 17:25:40 +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
Christophe Romain
04fde3620d
Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854)
...
SVN Revision: 1912
2009-02-23 15:56:19 +00:00
Alexey Shchepin
b6208955f3
* src/web/ejabberd_http.erl: Added a workaround for inet:peername
...
returning 'ebadf'
SVN Revision: 1910
2009-02-23 05:25:10 +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
Badlop
e6324f8a02
Fix a minor compilation warning and add EDoc comment
...
SVN Revision: 1907
2009-02-21 11:24:08 +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
Badlop
ce03742e1b
* src/ejabberd_listener.erl: When stopping a listener, don't stop
...
the listener supervisor (EJAB-874)
SVN Revision: 1891
2009-02-20 14:51:13 +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
Christophe Romain
6e055f60de
fix nodetree plugin resolver
...
SVN Revision: 1889
2009-02-19 11:25:56 +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
Badlop
74763be4dd
* src/ejabberd_listener.erl: More error detections
...
SVN Revision: 1884
2009-02-17 15:42:22 +00:00
Badlop
e4a3cdb486
* src/ejabberd_listener.erl: More error detections
...
SVN Revision: 1883
2009-02-17 09:53:29 +00:00
Badlop
4659ae7683
* src/ejabberd_config.erl: Check certfiles are readable on server
...
start and listener start (EJAB-753)
* src/ejabberd_listener.erl: Likewise
SVN Revision: 1882
2009-02-16 17:57:30 +00:00
Badlop
b0cc0cdcf9
* src/mod_privacy.erl: Privacy List: deny presence-out all + send
...
presence to: presence is sent (EJAB-255)
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 1881
2009-02-16 16:24:08 +00:00
Badlop
22d87353be
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
...
must provide the password, like other participants (EJAB-867)
SVN Revision: 1880
2009-02-16 15:57:02 +00:00
Badlop
f6ddd8bc5b
* src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
...
linkifying only a few known protocols (EJAB-850)
SVN Revision: 1879
2009-02-16 15:32:54 +00:00
Badlop
2bd54854ec
* src/mod_muc/mod_muc.erl: Export function to create MUC
...
room (thanks to Eric Cestari) (EJAB-729)
SVN Revision: 1878
2009-02-16 15:24:40 +00:00