Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-06 21:37:17 +02:00
Code Releases Activity
1,703 Commits 7 Branches 106 Tags 80 MiB
38b342e36f
Commit Graph

1428 Commits

Author SHA1 Message Date
Badlop
d22c483781 * src/ejabberd_ctl.erl: New option to require auth in ejabberdctl 
and restrict what commands and arguments can execute (EJAB-910)
* src/ejabberd_config.erl: Likewise

SVN Revision: 2024
 2009-04-17 13:48:59 +00:00
Badlop
5db572171b * src/ejabberd_commands.erl: API to restrict who can execute what 
commands and arguments (EJAB-910)

SVN Revision: 2023
 2009-04-17 13:43:15 +00:00
Badlop
1dad64a1cc * src/mod_muc/mod_muc_log.erl: Linkify also xmpp:..., as it was 
done previously (thanks to Konstantin Khomoutov)(EJAB-850)

SVN Revision: 2020
 2009-04-14 18:25:58 +00:00
Christophe Romain
0770e0eee4 after check, last commit was useless 
SVN Revision: 2019
 2009-04-14 12:46:55 +00:00
Christophe Romain
e740cfcc47 minor change, back to original patch 
SVN Revision: 2017
 2009-04-14 09:48:34 +00:00
Christophe Romain
412f65a0cb minor typo fix 
SVN Revision: 2016
 2009-04-10 21:11:35 +00:00
Christophe Romain
cd6587d9df minor improvement for best readability 
SVN Revision: 2014
 2009-04-10 08:40:10 +00:00
Christophe Romain
549fa6e836 make sure caps table are clean on startup 
SVN Revision: 2013
 2009-04-10 08:01:08 +00:00
Christophe Romain
409ab48068 better hadling of presence in mod_caps 
SVN Revision: 2012
 2009-04-10 07:36:17 +00:00
Badlop
7d0de522dd * src/msgs/pl.po: Fix some translations (thanks to Andrzej Smyk) 
SVN Revision: 2011
 2009-04-09 11:18:06 +00:00
Badlop
b326b7eb74 * 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
f4c88768da * src/mod_muc/mod_muc.erl: English fixes (thanks to Glenn Sieb) 
* src/mod_muc/mod_muc_log.erl: Likewise
* src/mod_muc/mod_muc_room.erl: Likewise
* src/mod_register.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 2009
 2009-04-08 19:04:13 +00:00
Badlop
4dd21545a0 * src/ejabberd_frontend_socket.erl: Fix compilation warnings and 
add TODO comments.

SVN Revision: 2007
 2009-04-08 18:56:11 +00:00
Badlop
7c415f3fdf * src/mod_irc/mod_irc_connection.erl: Fix compilation warnings. 
SVN Revision: 2006
 2009-04-08 18:52:52 +00:00
Christophe Romain
5a6f837800 pubsub: prevent blocking when sending lots of items, send last items to connected resource only, and cosmetic changes 
SVN Revision: 2005
 2009-04-08 15:53:46 +00:00
Evgeniy Khramtsov
f80c848692 * src/ejabberd_captcha.erl: fixed compilation warnings. 
SVN Revision: 2004
 2009-04-08 12:05:03 +00:00
Badlop
46efb20947 * src/ejabberd_captcha.erl: Small code reorganization; export new 
functions build_captcha_html/2 and check_captcha/2

SVN Revision: 2001
 2009-03-30 11:55:31 +00:00
Badlop
a93a3370ef * 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: 1998
 2009-03-24 16:22:33 +00:00
Christophe Romain
bc39341633 implement roster acces model (EJAB-780) 
SVN Revision: 1997
 2009-03-20 00:08:38 +00:00
Christophe Romain
1ac385f499 Allow more environment variable overrides in ejabberdctl (EJAB-891) 
SVN Revision: 1995
 2009-03-19 21:28:34 +00:00
Evgeniy Khramtsov
b789ee630d * src/ejabberd_captcha.erl: moved all functions from ejabberd_captcha process. Use mnesia:transaction/1 where it is needed. 
SVN Revision: 1994
 2009-03-14 06:27:05 +00:00
Evgeniy Khramtsov
3834bcc07e * src/ejabberd_captcha.erl: fixes previous commit 
SVN Revision: 1992
 2009-03-13 16:02:59 +00:00
Evgeniy Khramtsov
7e924341e4 * src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms). 
* src/ejabberd_config.erl: likewise.
* src/ejabberd_sup.erl: likewise.
* src/jlib.hrl: likewise.
* src/web/ejabberd_http.erl: likewise.
* src/mod_muc/mod_muc_room.erl: CAPTCHA support.
* src/mod_muc/mod_muc_room.hrl: likewise.

SVN Revision: 1991
 2009-03-13 16:01:46 +00:00
Badlop
f214b8c528 Fix mistake when calling win32_dns. 
SVN Revision: 1990
 2009-03-11 18:36:27 +00:00
Badlop
d4b5e94635 * src/tls/tls_drv.c: Fix encryption problem for ejabberd_http 
after timeout (thanks to Alexey Shchepin)(EJAB-880)

SVN Revision: 1986
 2009-03-10 15:21:36 +00:00
Christophe Romain
064d1af5de typo fix on roster access_model 
SVN Revision: 1984
 2009-03-10 12:08:41 +00:00
Christophe Romain
51faa601fa Fix PEP with other domains and s2s (EJAB-825) 
SVN Revision: 1980
 2009-03-10 10:35:57 +00:00
Badlop
d28efabb79 * src/tls/tls_drv.c: Fix to support OpenSSL older than 
0.9.8f (EJAB-877)(thanks to Jonathan Schleifer)
* doc/guide.tex: It is again supported OpenSSL older than 0.9.8f
* doc/guide.html: Likewise

SVN Revision: 1979
 2009-03-09 19:17:53 +00:00
Badlop
ad7bca0e78 * src/Makefile.in: In SunOS, use different C flags (thanks to 
Thomas)(EJAB-438)
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise

SVN Revision: 1977
 2009-03-07 09:52:26 +00:00
Badlop
787d225f1e * 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
Evgeniy Khramtsov
06eb54fef8 * src/ejabberd_hooks.erl: fixed typo 
SVN Revision: 1970
 2009-03-06 10:03:29 +00:00
Evgeniy Khramtsov
0e8f56f0b3 * src/ejabberd_hooks.erl: anonymous functions support. 
SVN Revision: 1969
 2009-03-06 09:34:13 +00:00
Badlop
f826dc2f9f * src/ejabberd_app.erl: In a Windows machine, explicitly add the 
nameservers, as it seems Erlang does not do itself (EJAB-860)
* src/win32_dns.erl: Get name servers from Windows registy (thanks
to Geoff Cant)

SVN Revision: 1968
 2009-03-05 20:03:18 +00:00
Badlop
ea715129e9 * src/ejabberd_auth.erl: If anonymous auth is enabled, when 
checking if the account already exists in other auth methods, take
into account if the auth method failed (EJAB-882)
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise

SVN Revision: 1966
 2009-03-04 18:34:02 +00:00
Christophe Romain
b3c39d120f Allow node creation without configure item 
SVN Revision: 1963
 2009-03-04 01:12:10 +00:00
Christophe Romain
965585eb56 update pubsub version 
SVN Revision: 1960
 2009-03-04 01:04:28 +00:00
Christophe Romain
020d6a46c5 Add roster subscriptions handling and make PEP events sent to all resources 
SVN Revision: 1956
 2009-03-03 22:42:37 +00:00
Badlop
117b67a31c Fix small compilation error introduced in revision 1923 
SVN Revision: 1931
 2009-02-28 00:01:27 +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
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
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
67e24366ee cosmetic changes 
SVN Revision: 1923
 2009-02-27 03:09:00 +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
Badlop
1650a946f2 * src/ejabberd_listener.erl: Fix report message of 'undef' error 
SVN Revision: 1916
 2009-02-24 17:25:40 +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
Badlop
e6324f8a02 Fix a minor compilation warning and add EDoc comment 
SVN Revision: 1907
 2009-02-21 11:24:08 +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
6e055f60de fix nodetree plugin resolver 
SVN Revision: 1889
 2009-02-19 11:25:56 +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
Badlop
b0e749eca5 * 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: 1877
 2009-02-16 14:49:20 +00:00
Badlop
d0f1300a84 * src/web/ejabberd_http_poll.erl: Allow configuration of session 
timeout, using new global option http_poll_timeout (EJAB-135)
* doc/guide.tex: Document new option
* doc/guide.html: Likewise

SVN Revision: 1876
 2009-02-14 09:03:26 +00:00
Badlop
70e431787e * src/ejabberd_listener.erl: Report error at startup if a listener 
module isn't available or is not an ejabberd listener (EJAB-868)

SVN Revision: 1875
 2009-02-13 23:52:24 +00:00
Badlop
d0fc8fe056 * src/mod_shared_roster.erl: Fix bug: a pending subscription 
request, and later the requester added to the roster due to a
shared roster group, that request could neither be accepted or
rejected (thanks to Brian Cully)(EJAB-869)

SVN Revision: 1874
 2009-02-13 23:01:41 +00:00
Badlop
a06bffa413 * src/web/ejabberd_web_admin.erl: Show big integers with comma 
separators for easy reading

SVN Revision: 1873
 2009-02-13 22:13:34 +00:00
Badlop
3524172856 * src/ejabberd_system_monitor.erl: Allow parametrizable watchdog 
threshold: option watchdog_large_heap or chatting with the
watchdog bot (EJAB-545)
* src/ejabberd_config.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1872
 2009-02-13 19:27:56 +00:00
Christophe Romain
d1001a99c2 prevent from calling get_vh_registered_users/2 when not available 
SVN Revision: 1869
 2009-02-13 13:28:10 +00:00
Christophe Romain
bb13c9e8ab fix delete-items issue and manage-affiliations typo 
SVN Revision: 1868
 2009-02-09 13:37:58 +00:00
Badlop
ec31aef6cb * src/mod_pubsub/mod_pubsub.erl: The table pubsub_node in ejabberd 
older than 2.0.2 had indexes for parentid and type. This is not
required since ejabberd 2.0.2, so those indexes can be
deleted. (EJAB-669)

SVN Revision: 1864
 2009-02-05 21:23:16 +00:00
Badlop
e321a241b7 * src/Makefile.in: Fix arguments to Install program 
SVN Revision: 1860
 2009-02-03 10:25:06 +00:00
Badlop
aab07df37b * 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: 1859
 2009-02-02 10:12:44 +00:00
Evgeniy Khramtsov
e790ceea60 * src/eldap/eldap.erl: moves waiting for response queries to 
pending queue on an LDAP connection failure.

SVN Revision: 1856
 2009-01-30 15:22:18 +00:00
Evgeniy Khramtsov
8530e628b4 * src/eldap/eldap.erl: implemented queue for pending queries. 
SVN Revision: 1855
 2009-01-27 13:24:18 +00:00
Evgeniy Khramtsov
e2fa195e20 * src/eldap/eldap.erl: Close a connection on tcp_error. 
SVN Revision: 1851
 2009-01-23 07:28:49 +00:00
Badlop
ee1140483c * 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
Badlop
d0273f4630 * 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

SVN Revision: 1843
 2009-01-21 19:49:26 +00:00
Badlop
b9caf7e610 * src/ejabberd_hooks.erl: Explanation in EDoc of some functions 
SVN Revision: 1842
 2009-01-21 17:36:28 +00:00
Badlop
3e2048ace9 * 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: 1835
 2009-01-20 19:42:08 +00:00
Badlop
2e511c78af * src/mod_privacy.erl: Only run roster_get_jid_info if privacy 
list has subscription or group (thanks to George Hazan)(EJAB-851).
Sort items in privacy list by order before storing (EJAB-848)
* src/mod_privacy.hrl: Likewise
* src/mod_privacy_odbc.erl: Likewise

SVN Revision: 1834
 2009-01-20 17:34:58 +00:00
Mickaël Rémond
579e1972d5 * src/ejabberd_c2s.erl: Added comments. 
SVN Revision: 1823
 2009-01-17 16:33:35 +00:00
Badlop
43e12a3702 * src/mod_privacy.erl: Privacy list items must be processed in the 
specified order (EJAB-848)
* src/mod_privacy_odbc.erl: Likewise

SVN Revision: 1822
 2009-01-16 16:06:21 +00:00
Mickaël Rémond
d041c1127d * src/tls/Makefile.win32: Windows compilation support. 
* src/tls/tls_drv.c: Likewise.
* src/tls/stdint.h: Likewise.

SVN Revision: 1816
 2009-01-13 16:33:17 +00:00
Badlop
52930b77d8 * src/msgs/pl.po: Fix typo (thanks to Apag0r)(EJAB-844) 
SVN Revision: 1814
 2009-01-12 23:47:07 +00:00
Badlop
43a98ab69b * src/web/ejabberd_web_admin.erl: Use textareas for large input 
like ejabberd module options and listening port options. Show
result of POST more clearly. Ensure access rules are shown with
some minimum separation. Improve menu headers. (EJAB-562)
* src/web/ejabberd_web_admin.hrl: Likewise
* src/mod_offline.erl: Likewise
* src/mod_offline_odbc.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
* src/mod_shared_roster.erl: Likewise

SVN Revision: 1813
 2009-01-12 21:48:34 +00:00
Badlop
ba2eb35590 * src/ejabberd_listener.erl: New way to configure IP address and 
IP version of listener. Support for definition of IP address in
string format, and implicit definition of IP
version (EJAB-388). Support for defining several listeners: all
with same port number but different IP addresses (EJAB-389)(thanks
to Fabrice Colliot and Sergei Golovan). Better report in WebAdmin
of problem when starting a listener. The old configuration method
of ip tuple and inet6 is fully supported for backwards
compatibility, but is not documented in the Guide anymore.
* src/ejabberd_config.erl: Likewise
* src/mod_proxy65/mod_proxy65_stream.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise
* doc/guide.tex: Document the new way to configure IP address and
IP version of listener, undocument options ip and inet6
* doc/guide.html: Likewise

SVN Revision: 1812
 2009-01-12 20:03:02 +00:00
Badlop
55db20d4b7 * src/web/ejabberd_web_admin.erl: New appearance of WebAdmin logo, 
fixed logo-fill.

SVN Revision: 1811
 2009-01-12 19:24:25 +00:00
Badlop
b3328c08a6 * doc/guide.tex: Fix some English strings: JID -> Jabber ID; 
jabberd 1.4 -> jabberd14; commited -> committed
* src/*/*.erl: Likewise
* src/msgs/*.msg: Likewise
* src/msgs/*.po: Likewise

SVN Revision: 1810
 2009-01-12 18:41:46 +00:00
Alexey Shchepin
562e6c8d39 * src/odbc/ejabberd_odbc.erl: Fixed processing of UPDATE results 
with pgsql

SVN Revision: 1808
 2009-01-12 18:15:49 +00:00
Badlop
f09509502e * doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842) 
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text

SVN Revision: 1804
 2009-01-12 14:44:42 +00:00
Christophe Romain
1ac9246a49 prevent unauthorized entity to gain none-affiliation for given entity 
SVN Revision: 1802
 2009-01-11 04:08:10 +00:00
Christophe Romain
8090011126 fix previous partial patch (EJAB-840) 
SVN Revision: 1799
 2009-01-11 01:45:24 +00:00
Christophe Romain
c170783a49 fix owners cache and fix unsubscribe permissions (EJAB-840) 
SVN Revision: 1797
 2009-01-11 01:41:06 +00:00
Christophe Romain
38dcae1fc8 fix unsubscription of full jid subscribed node (EJAB-839) 
SVN Revision: 1794
 2009-01-10 13:38:10 +00:00
Badlop
eaa1644ebd * src/mod_configure.erl: Fix access check for vhost configuration 
SVN Revision: 1787
 2009-01-09 00:39:57 +00:00
Mickaël Rémond
f0af10e600 * src/ejabberd_listener.erl: Define send timeout option to avoid blocking on socket send (EJAB-746). 
* src/ejabberd_s2s_out.erl: Likewise.

SVN Revision: 1784
 2009-01-08 20:49:16 +00:00
Christophe Romain
a1f0ad3300 apply delete-any feature 
SVN Revision: 1783
 2009-01-08 18:45:59 +00:00
Christophe Romain
967bbe7f03 fix EJAB-701 and EJAB-836 
SVN Revision: 1779
 2009-01-08 14:06:35 +00:00
Badlop
14bc7cf77f * src/mod_roster.erl: Show hyperlinks to local contacts when 
browsing roster of account in Web Admin (EJAB-480)
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 1778
 2009-01-07 01:38:45 +00:00
Badlop
9f80ec4fb6 * src/web/ejabberd_web_admin.erl: WebAdmin serves Guide and links 
to related sections; the path to guide.html can be configured with
option doc_path (EJAB-837)
* src/web/ejabberd_web_admin.hrl: Likewise
* src/mod_shared_roster.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1777
 2009-01-07 00:55:02 +00:00
Badlop
a0d48c63a3 * src/msgs/ru.po: Fix typo (thanks to Dominges) 
* src/msgs/ru.msg: Likewise

SVN Revision: 1776
 2009-01-06 15:09:53 +00:00
Alexey Shchepin
b1252f837f * src/tls/tls_drv.c: Added a flag to avoid certificate validation 
* src/tls/tls.erl: Likewise
* src/ejabberd_c2s.erl: Likewise

SVN Revision: 1774
 2009-01-05 17:21:10 +00:00
Badlop
91a7110941 * src/*.erl: Fix EDoc comments 
SVN Revision: 1771
 2009-01-03 21:29:54 +00:00
Christophe Romain
01d761a901 PubSub: Added access-whitelist and member-affiliation features (EJAB-780) 
SVN Revision: 1768
 2009-01-03 00:55:05 +00:00
Christophe Romain
e710a24860 PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix 
SVN Revision: 1766
 2009-01-03 00:25:40 +00:00
Mickaël Rémond
1f57a380c8 * src/ejabberd_c2s.erl: Remove useless comment and port Alexey fix to 2.0.x branch. 
SVN Revision: 1764
 2008-12-29 12:06:34 +00:00
Alexey Shchepin
df478a8e90 * src/ejabberd_c2s.erl: Bugfix in "from" attribute checking 
SVN Revision: 1763
 2008-12-29 11:11:37 +00:00
Evgeniy Khramtsov
5a5ab955cb * src/odbc/odbc_queries.erl: replaced string:join/2 function. 
Removed ugly "catch" statement from update_t/4.
WARNING: this change requires last version of mysql driver.
You can update it from ejabberd-modules repository.

SVN Revision: 1762
 2008-12-29 09:26:20 +00:00
Evgeniy Khramtsov
85fdf7cb25 * src/odbc/ejabberd_odbc.erl: Print meaningful error message when 
an SQL transaction exceeds number of restarts. Also rollbacks
this transaction to prevent deadlocks.

SVN Revision: 1761
 2008-12-29 04:21:27 +00:00
Mickaël Rémond
707aa4fb8c * src/ejabberd_c2s.erl: We should allow use of bare resource in from by the client (partially revert r1727) (EJAB-812) 
SVN Revision: 1759
 2008-12-28 12:15:51 +00:00
Badlop
1944aa097f Use inet:gethostbyname instead of inet_res:getbyname 
SVN Revision: 1758
 2008-12-26 18:36:53 +00:00
Badlop
394245620e * src/web/ejabberd_web_admin.erl: Show in ejabberd Web Admin the 
connection method and connected node of Jabber clients (thanks to
Oleg Palij)(EJAB-319)

SVN Revision: 1757
 2008-12-26 12:44:54 +00:00
Badlop
682909e0fc * src/ejabberd_config.erl: Option outgoing_s2s_options to define 
s2s outgoing behaviour: IPv4, IPv6 and timeout (thanks to Stephan
Maka)(EJAB-665)
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_socket.erl: Likewise
* src/ejabberd.cfg.example: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1756
 2008-12-26 11:45:08 +00:00
Evgeniy Khramtsov
11825e7a33 * src/odbc/ejabberd_odbc.erl: get rid of SERIALIZABLE isolation level on MySQL connections. 
* src/odbc/odbc_queries.erl: replaces all delete->insert chains with update->insert.
* src/mod_privacy_odbc.erl: moved sql queries to odbc_queries.erl.
* src/mod_roster_odbc.erl: changed interface for odbc_queries.erl.

SVN Revision: 1755
 2008-12-26 09:38:54 +00:00
Badlop
594bc36ce5 * src/aclocal.m4: Fixes in configure script: fix 
disable-disable_zlib and disable-pam; in case of problems, PAM
verification aborts with error instead of warning. (EJAB-787)
* src/configure.ac: Likewise
* src/configure: Likewise

SVN Revision: 1754
 2008-12-24 12:03:13 +00:00
Badlop
7808dc11af * src/acl.erl: New ACL: shared_group (thanks to Maxim Ryazanov) 
* doc/guide.tex: Likewise

* src/mod_shared_roster.erl: Push new group members when
registered or manually added to group: EJAB-730 EJAB-731 EJAB-732
EJAB-767 EJAB-794. When user is added to group, push it to other
members, and other members to it. When user is removed from group,
push deletion to other members, and other members to it. When user
is registered, push him to members of group @all@. When user is
deleted, push deletion to members of group @all@. Document several
functions in mod_shared_roster.

* src/ejabberd_auth.erl: Rename hook user_registered to
register_user, for name consistency with the widely used hook
remove_user. Run hook register_user in ejabberd_auth, so it's run
when account is created with any method. Run hook remove_user in
ejabberd_auth, so it's run when account is deleted with any
method.
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
* src/mod_register.erl: Likewise

SVN Revision: 1752
 2008-12-23 19:15:33 +00:00
Badlop
35b1e2885e * src/jlib.erl: Implementation of XEP-0059 Result Set 
Management (thanks to Eric Cestari)(EJAB-807)
* src/jlib.hrl: Likewise
* src/mod_muc/mod_muc.erl: Likewise

SVN Revision: 1750
 2008-12-23 13:04:42 +00:00
Christophe Romain
17cbd1614a typo fix 
SVN Revision: 1748
 2008-12-23 10:53:06 +00:00
Christophe Romain
4d20367a0c make caps store only required user_caps_default 
SVN Revision: 1747
 2008-12-23 10:51:44 +00:00
Christophe Romain
5adfcfad7a Improve handling of PEP sent to external contacts (EJAB-825) 
SVN Revision: 1745
 2008-12-23 10:20:34 +00:00
Badlop
42036d8f68 * src/mod_last.erl: Implement workaround for uptime statistic in 
32 bit machines, so it can show uptime greater than 50
days (EJAB-610)
* src/mod_last_odbc.erl: Likewise
* src/ejabberd_config.erl: Store start time in local_config table

SVN Revision: 1744
 2008-12-23 01:34:52 +00:00
Badlop
af2fa5b5f5 * src/cyrsasl_digest.erl: Check digest-uri in SASL digest 
authentication (thanks to Paul Guyot)(EJAB-569)

SVN Revision: 1743
 2008-12-23 01:02:44 +00:00
Badlop
74f15f790a * src/odbc/odbc_queries.erl: Fix removal of private_storage of an 
account when the account is removed

* src/mod_privacy.erl: Remove privacy lists of an account when the
account is removed (EJAB-720)
* src/mod_privacy_odbc.erl: Likewise

SVN Revision: 1742
 2008-12-23 00:48:09 +00:00
Christophe Romain
4469880c2e Fix send_last_published_item issue when running on clustered table (EJAB-793) 
SVN Revision: 1740
 2008-12-20 00:00:24 +00:00
Christophe Romain
c0fb556a01 Check option of the nodetree instead of checking configuration 
SVN Revision: 1737
 2008-12-18 13:45:46 +00:00
Badlop
8f43867091 * src/mod_pubsub/mod_pubsub.erl: Fix update pubsub tables from 
ejabberd 1.x to 2.x (EJAB-817)

SVN Revision: 1734
 2008-12-16 17:44:48 +00:00
Badlop
867ce5be32 * doc/guide.tex: Fix capitalization of some section titles 
* doc/guide.tex: Mention as optional Requirements: mysql, pgsql
and pam

* src/ejabberd_admin.erl: Command reopen-log must also rotate
sasl.log (thanks to Alexander Tsvyashchenko)(EJAB-711)
* src/ejabberd_logger_h.erl: Export the function rotate_log/1
* doc/guide.tex: Improve explanation of log files rotation

* doc/guide.tex: Improve explanation of watchdog admins
option: only useful for developers (EJAB-816)
* src/ejabberd.cfg.example: Likewise

* doc/guide.tex: Say 'higher' instead of 'newer' in requirements
* README: Likewise

* doc/guide.tex: Simplify example mod_muc configuration

SVN Revision: 1732
 2008-12-16 17:36:34 +00:00
Christophe Romain
a800ac5a4e fix get_item_name deadlock on transaction 
SVN Revision: 1728
 2008-12-15 19:55:35 +00:00
Alexey Shchepin
620cbc765c * src/ejabberd_c2s.erl: Bugfix in "from" attribute checking 
SVN Revision: 1727
 2008-12-12 13:08:00 +00:00
Christophe Romain
6e5a32308a fix typo bug injected in r1712 
SVN Revision: 1724
 2008-12-09 22:42:01 +00:00
Christophe Romain
e8635b99c8 prevent publish items with invalid XML schema (EJAB-699) 
SVN Revision: 1722
 2008-12-09 22:02:47 +00:00
Christophe Romain
07e9ad307e cosmetic change (intentation and spaces) 
SVN Revision: 1719
 2008-12-08 23:28:50 +00:00
Christophe Romain
23ce0b312d remove pubsub_state record when unsubscribing node without affiliation (EJAB-776) 
SVN Revision: 1717
 2008-12-08 21:47:50 +00:00
Christophe Romain
dceb817853 reply to suscriptions options queries with unsupported feature error (EJAB-713) 
SVN Revision: 1716
 2008-12-08 21:17:46 +00:00
Christophe Romain
c443ee4f4a several pubsub improvements 
SVN Revision: 1715
 2008-12-08 19:50:50 +00:00
Christophe Romain
e2d8154a80 Reduce memory consumption due to caps handling 
SVN Revision: 1712
 2008-12-08 14:10:55 +00:00
Mickaël Rémond
4618ec1fef * src/ejabberd_c2s.erl: Enforce client stanza from attribute (EJAB-812). 
* src/jlib.erl: Likewise.

SVN Revision: 1706
 2008-12-08 09:21:36 +00:00
Badlop
8e32cc11cb Fix default value of default_room_options (thanks to Aleksey Shchepin) 
SVN Revision: 1702
 2008-12-03 15:06:21 +00:00
Jérôme Sautret
9e679aa621 * src/odbc/ejabberd_odbc.erl: close MySQL connections on terminate (needs mysql r829) 
SVN Revision: 1700
 2008-12-03 10:58:19 +00:00
Badlop
bc9ba75c2b No need to define default value of history field because it is explicitely set when the record is created 
SVN Revision: 1699
 2008-12-02 19:45:39 +00:00
Badlop
f124bb3d10 * src/mod_muc/mod_muc_room.erl: Move definitions to header file 
* src/mod_muc/mod_muc_room.hrl: New header file
* src/Makefile.in: Likewise

SVN Revision: 1698
 2008-12-02 19:23:12 +00:00
Badlop
7348f4a553 Remove debug line from SVN r1685 
SVN Revision: 1689
 2008-11-28 19:51:30 +00:00
Alexey Shchepin
964cb84864 * src/mod_muc/mod_muc_room.erl: Clean user activity after timeout 
(EJAB-804)

SVN Revision: 1688
 2008-11-28 16:06:39 +00:00
Badlop
78b90e9300 * src/ejabberdctl.template: Fix detection of ejabberdctl.cfg path 
SVN Revision: 1687
 2008-11-26 18:02:41 +00:00
Badlop
340562e452 * src/mod_irc/mod_irc.erl: Announce disco#info (thanks to Spike) 
* src/mod_muc/mod_muc.erl: Announce disco#info disco#items
* src/mod_proxy65/mod_proxy65_service.erl: No announce disco#items
* src/mod_pubsub/mod_pubsub.erl: Announce disco#info disco#items
* src/mod_vcard.erl: Announce disco#info

SVN Revision: 1686
 2008-11-26 16:04:27 +00:00
Badlop
6a785fa536 * src/gen_mod.erl: First store module options in ETS and Mnesia, 
then start the module. In case of failure, remove options from
ETS. Until now the module was started before the options were
stored in database, and some modules started incorrectly because
they couldn't access the options from database; for instance
mod_muc_room required this for reading max_users option.

* src/mod_muc/mod_muc_room.erl: Include the value of max_users
service option and the current max_users room option in the list
of allowed room limit values.

SVN Revision: 1685
 2008-11-26 15:10:38 +00:00
Christophe Romain
e68a731219 pubsub/pep: get_node_affiliations resultset bugfix 
SVN Revision: 1684
 2008-11-25 23:05:26 +00:00
Evgeniy Khramtsov
11e5617efc * src/eldap/Makefile.in: added +optimize and +driver 
compilation options
* src/eldap/Makefile.win32: Likewise

SVN Revision: 1682
 2008-11-24 13:27:04 +00:00
Mickaël Rémond
cc858469ec * src/ejabberdctl.template: Added the ability to define the --config-dir option. 
SVN Revision: 1681
 2008-11-23 16:41:50 +00:00
Alexey Shchepin
c2d81c59b6 * src/ejabberd_receiver.erl: Hibernate after timeout 
* src/ejabberd_frontend_socket.erl: Likewise

SVN Revision: 1680
 2008-11-23 09:43:52 +00:00
Badlop
91b328b7d5 URL path should be tokenized by / and then decoded (EJAB-786). 
SVN Revision: 1679
 2008-11-12 10:03:27 +00:00
Badlop
9f110a6352 * src/web/ejabberd_http.erl: Include recognized headers in 
request_headers as atoms, and others as strings (EJAB-778)

SVN Revision: 1678
 2008-11-12 09:58:28 +00:00
Alexey Shchepin
4709ed58aa * src/tls/tls_drv.c: Don't create a SSL context on every 
connection and disable SSLv2 on outgoing connections (EJAB-781)

SVN Revision: 1675
 2008-11-10 14:32:51 +00:00
Mickaël Rémond
10e3f2cf92 * src/ejabberd_s2s_out.erl: exports the DNS resolution function. 
SVN Revision: 1674
 2008-11-08 17:50:54 +00:00
Badlop
02d68146bd * src/extauth.erl: When the extauth call fails or timeouts, deny 
authorization. Use two timeouts: 60s for script initialization and
10s for regular calls. (thanks to Kevin Crosbie from
Ravenpack) (EJAB-627)

SVN Revision: 1673
 2008-11-06 15:36:49 +00:00
Alexey Shchepin
8cdebd485a * src/ejabberd_c2s.erl: Disable zlib when STARTTLS is required 
SVN Revision: 1672
 2008-11-03 13:54:42 +00:00
Badlop
f032cf3380 * src/Makefile.in (clean-local): Delete also ejabberdctl.example 
SVN Revision: 1671
 2008-10-27 12:19:06 +00:00
Badlop
ff6891cdd0 * src/translate.erl: When a translation file can't be loaded, show 
detailed error message

SVN Revision: 1669
 2008-10-24 22:16:17 +00:00
Badlop
9d521c9dd0 * src/ejabberd_ctl.erl: If ejabberd didn't start correctly: 
'ejabberdctl status' suggests to look in log files; any other
ejabberdctl command shows 'status'.

SVN Revision: 1668
 2008-10-24 22:11:42 +00:00
Badlop
9e55a1291a * src/ejabberd_app.erl: Open ejabberd.log sooner, so errors during 
ejabberd initialization are logged in that file (EJAB-777). Write
a log message when ejabberd finishes the start or stop.

SVN Revision: 1667
 2008-10-24 22:07:38 +00:00
Badlop
426e75a298 * src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721) 
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
* src/mod_shared_roster.erl: Likewise

SVN Revision: 1666
 2008-10-24 18:01:08 +00:00
Badlop
cdcf2d380b * src/ejabberd_lstener.erl: Fix listeners 
* src/ejabberd_sup.erl: Likewise
* src/gen_mod.erl: Likewise

SVN Revision: 1665
 2008-10-24 17:26:11 +00:00
Alexey Shchepin
7181957506 * src/ejabberd_frontend_socket.erl: Fixed SSL sockets 
SVN Revision: 1664
 2008-10-23 14:59:49 +00:00
Badlop
5264d9299d * src/Makefile.in: docdir should be prefixed with DESTDIR (thanks 
to Jack Moffitt)(EJAB-775)

SVN Revision: 1662
 2008-10-17 17:37:50 +00:00
Christophe Romain
f6e2a58772 does not write item when max_items set to 0 (solves EJAB-768) 
SVN Revision: 1661
 2008-10-17 00:43:58 +00:00
Christophe Romain
0083e56c22 fix remove_user not unsubscribing user (EJAB-684) 
SVN Revision: 1659
 2008-10-16 23:09:51 +00:00
Christophe Romain
a910c4baa1 fix badarg issue on get_roster_info when allowed roster groups is not defined 
SVN Revision: 1656
 2008-10-16 22:12:05 +00:00
Christophe Romain
9a71d6b87a fix pubsub_publish_item hook ServerHost parameter (EJAB-772) 
SVN Revision: 1655
 2008-10-14 12:41:46 +00:00
Jérôme Sautret
7c736a5ea0 * src/odbc/ejabberd_odbc.erl: log MySQL driver messages. 
SVN Revision: 1652
 2008-10-13 15:25:30 +00:00
Badlop
6bd76ebfda Replace mentions of mod_xmlrpc to ejabberd_xmlrpc 
SVN Revision: 1645
 2008-10-13 09:01:08 +00:00
Badlop
fa18b35df5 * src/web/ejabberd_web_admin.erl: When requesting page of 
nonexistent user, show 'Not Found' page (EJAB-771)

SVN Revision: 1644
 2008-10-13 08:32:04 +00:00
Badlop
2af52abdba * src/web/ejabberd_web_admin.erl: Run new hook 
webadmin_user_parse_query when POST in web admin user
page (thanks to Oleg Palij)(EJAB-747)
* src/mod_offline.erl: Add button "Remove All Offline Messages" in
a user page (thanks to Oleg Palij)(EJAB-747)
* src/mod_offline_odbc.erl: Likewise

SVN Revision: 1643
 2008-10-12 14:16:05 +00:00
Badlop
42115a8cfb * src/web/ejabberd_web_admin.erl: Improve Web Admin navigation 
menu for vhosts and nodes (EJAB-734)

SVN Revision: 1642
 2008-10-12 13:58:05 +00:00
Badlop
04981b5e44 * src/mod_configure.erl: Update calls from ctl to 
commands (EJAB-694)
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 1640
 2008-10-12 12:05:31 +00:00
Badlop
3bfe585364 * src/ejabberd_sm.erl: Update from ctl to commands (EJAB-694) 
* src/ejabberd_s2s.erl: Likewise

SVN Revision: 1639
 2008-10-12 12:04:10 +00:00
Badlop
d5c3006136 * src/ejabberd_auth.erl: Update from ctl to commands (EJAB-694) 
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise

SVN Revision: 1638
 2008-10-12 12:01:56 +00:00
Badlop
416a939352 * src/ejabberdctl.template: Move help print to a separate 
function (EJAB-694)

SVN Revision: 1637
 2008-10-12 12:00:20 +00:00
Badlop
f2bd87b7cf * src/ejabberd_ctl.erl: Add frontend support for 
commands (EJAB-694). Categorization and sorting of commands in
ejabberd_ctl help (EJAB-313). Lines in command line help of length
80, and text formatting (EJAB-473)

SVN Revision: 1636
 2008-10-12 11:58:30 +00:00
Badlop
25d1094468 * src/ejabberd_app.erl: Initialize ejabberd_commands and start 
ejabbed_admin (EJAB-694)

SVN Revision: 1635
 2008-10-12 11:56:07 +00:00
Badlop
10ab81f4b4 * src/ejabberd_admin.erl: Implement commands from old 
ejabberd_ctl (EJAB-694)

SVN Revision: 1634
 2008-10-12 11:55:06 +00:00
Badlop
dda582db13 * src/ejabberd_commands.erl: New 'ejabberd commands': separate 
command definition and calling interface (EJAB-694)
* src/ejabberd_commands.hrl: Likewise

SVN Revision: 1633
 2008-10-12 11:53:25 +00:00
Badlop
be2f6e0517 * src/mod_proxy65/mod_proxy65.erl: Update so the listener starts 
correctly (EJAB-303)
* src/mod_proxy65/mod_proxy65_service.erl: Likewise

SVN Revision: 1632
 2008-10-12 11:17:35 +00:00
Badlop
9194c25a4e * src/ejabberd_app.erl: Start listeners explicitely at server 
start after everything else (EJAB-303). Implement support in
ejabberd for 'independent listeners', which handle their
connections themselves: gen_tcp:listen, etc.
* src/ejabberd_listener.erl: Likewise
* src/ejabberd_socket.erl: Likewise
* src/ejabberd_sup.erl: Likewise

SVN Revision: 1631
 2008-10-12 11:11:29 +00:00
Christophe Romain
b2d21cb71c fix typo 
SVN Revision: 1630
 2008-10-10 20:27:18 +00:00
Christophe Romain
385a1d3f0f uncomment pubsub_publish_item hook call (EJAB-765) 
SVN Revision: 1629
 2008-10-10 20:22:18 +00:00
Jérôme Sautret
b65caa82fb * src/mod_roster_odbc.erl: fix MySQL multiple requests issue. 
SVN Revision: 1612
 2008-10-07 12:32:12 +00:00
Jérôme Sautret
2f8127d343 * src/ejabberd_rdbms.erl: fix SQL database reconnection 
issues (EJAB-764) and add odbc_start_interval configuration
directive (default to 30 seconds).
* src/odbc/ejabberd_odbc.erl: likewise.
* src/odbc/ejabberd_odbc_sup.erl: likewise.
* doc/guide.tex: likewise.

SVN Revision: 1600
 2008-10-06 14:18:46 +00:00
Jérôme Sautret
a2340ea8b8 * src/odbc/odbc_queries.erl: Fix empty query that fail on MySQL. 
SVN Revision: 1597
 2008-10-03 15:42:40 +00:00
Jérôme Sautret
744b827169 * src/mod_vcard_odbc: added vCard support for MS SQL Server 2005 (missing from previous commit) 
SVN Revision: 1596
 2008-10-03 15:30:56 +00:00
Jérôme Sautret
8883e4ad8b * src/mod_vcard_odbc: added vCard support for MS SQL Server 2005. 
* src/odbc/odbc_queries.erl: likewise.
* src/odbc/mssql2005.sql: likewise.

SVN Revision: 1595
 2008-10-03 15:29:48 +00:00
Mickaël Rémond
3a2fb34a61 * src/mod_shared_roster.erl: Correct roster push when changing a shared roster entry name (EJAB-738). 
SVN Revision: 1590
 2008-10-01 14:52:25 +00:00
Badlop
16a508cdb9 * src/*/Makefile.win32: Provide explicit beam filenames because 
nmake does not accept wildcards (thanks to Attila
Vangel)(EJAB-543)

SVN Revision: 1588
 2008-09-30 16:12:05 +00:00
Christophe Romain
43647c6d50 fix licence header 
SVN Revision: 1587
 2008-09-30 08:58:37 +00:00
Christophe Romain
70dd325aef EJAB-739 and EJAB-751 improvements 
SVN Revision: 1576
 2008-09-25 17:26:06 +00:00
Mickaël Rémond
eabd25a8bf * src/mod_configure.erl: Fix adhoc commands reply types for "get-online-users-num" and "get-registered-users-num" (EJAB-756). 
SVN Revision: 1569
 2008-09-22 16:08:37 +00:00
Badlop
81c70c347f Fix: provide the port as an integer, not string (EJAB-560) 
SVN Revision: 1562
 2008-09-12 14:31:04 +00:00
Badlop
e9d62b39ef * src/web/ejabberd_http.hrl: Provide Host, Port, Headers and 
Transfer Protocol in request (thanks to Eric Cestari)(EJAB-560)
* src/web/ejabberd_http.erl: Likewise

SVN Revision: 1561
 2008-09-12 11:45:16 +00:00
Mickaël Rémond
b6a706756e * src/odbc/mssql2000.sql: Script for MSSQL 2000 
* src/odbc/mssql2005.sql: Script for MSSQL 2005
* src/odbc/mssql.sql: removed

SVN Revision: 1558
 2008-09-02 14:14:42 +00:00
Christophe Romain
11788b2953 send last published events now supports PEP events from unavailable users nodes (EJAB-698) 
SVN Revision: 1550
 2008-08-27 09:28:47 +00:00
Christophe Romain
0832ad392d get_items bugfix (EJAB-716) 
SVN Revision: 1542
 2008-08-25 22:54:48 +00:00
Christophe Romain
11f74201ab Prevent case_clause error when ejabber_odbc:sql_query returns {error, Reason} 
SVN Revision: 1540
 2008-08-25 13:36:34 +00:00
Christophe Romain
5c9069d677 Prevent case_clause error when ejabber_odbc:sql_query returns {error, Reason} 
SVN Revision: 1538
 2008-08-25 13:12:23 +00:00
Badlop
2d226b39bf * src/ejabberd_check.erl: Detect correctly MSSQL and ODBC 
configuration (EJAB-710)

SVN Revision: 1536
 2008-08-25 12:08:22 +00:00
Geoff Cant
35ed848fe8 EJAB-624: fixes mod_muc_room:is_visitor/2 to use get_role not get_affiliation 
SVN Revision: 1534
 2008-08-23 23:17:17 +00:00
Badlop
d08b1c62bb * src/ejabberd_router.erl: Fix call to mnesia match_object 
SVN Revision: 1533
 2008-08-22 11:35:32 +00:00