Alexey Shchepin
24ff98d50d
Fixed conflict
...
SVN Revision: 887
2007-08-24 16:18:46 +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
38ad132ba2
* src/ejabberd_sm.erl: Removed check which denies resource to
...
receive its own presence
SVN Revision: 885
2007-08-24 03:54:42 +00:00
Alexey Shchepin
727a70c2cb
* src/web/ejabberd_web_admin.erl: Added hooks to allow plugins to
...
add their pages without modifying ejabberd_web_admin.erl (thanks
to Badlop)
* src/web/ejabberd_web_admin.hrl: Macro definitions moved here
* src/mod_shared_roster.erl: Updated
* src/mod_offline.erl: Likewise
* src/mod_offline_odbc.erl: Likewise
SVN Revision: 884
2007-08-23 00:51:54 +00:00
Alexey Shchepin
106cf7f963
* src/jlib.erl: Use http_base_64:decode if available
...
SVN Revision: 883
2007-08-21 22:28:41 +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
Alexey Shchepin
8cc493a43f
* src/mod_offline.erl: Renamed MAX_OFFLINE_MSGS to MaxOfflineMsgs
...
SVN Revision: 881
2007-08-20 18:02:12 +00:00
Jérôme Sautret
6fcef6f5c4
* src/odbc/ejabberd_odbc_sup.erl: Add an odbc_pool_size config file option to choose the number of SQL
...
connection in each pool (EJAB-58).
* src/odbc/ejabberd_odbc.erl: Add an odbc_keepalive_interval config file option to perform a keep
alive query at given interval (EJAB-206).
SVN Revision: 879
2007-08-16 16:37:00 +00:00
Mickaël Rémond
731457a8bb
* src/mod_offline.erl: Added a config option to define the maximum
...
number of offline messages per user (EJAB-314).
SVN Revision: 878
2007-08-13 17:28:26 +00:00
Mickaël Rémond
db957c4295
* src/mod_offline.erl: Returns an error message to sender when
...
message is discarded due to quota (EJAB-314).
SVN Revision: 871
2007-08-13 10:27:28 +00:00
Mickaël Rémond
915d94b0dc
* src/odbc/ejabberd_odbc.erl: UTF-8 support for MySQL5 (EJAB-318).
...
SVN Revision: 868
2007-08-12 15:39:01 +00:00
Mickaël Rémond
b352d1bddd
* src/mod_offline.erl: Typo.
...
SVN Revision: 861
2007-08-08 09:54:26 +00:00
Mickaël Rémond
4e82569bcb
* src/mod_offline.erl: Only count messages if a quota has been
...
actually set (EJAB-314).
* src/p1_mnesia.erl: Minor coding style change.
SVN Revision: 860
2007-08-08 09:48:41 +00:00
Mickaël Rémond
9d03ea3f98
* src/mod_offline.erl: Started implementation of mod_offline
...
quota. For now, it require change in code. Will be turn into a
config file parameter soon. (EJAB-314).
* src/p1_mnesia.erl: Added memory efficient record count in
Mnesia.
SVN Revision: 859
2007-08-07 16:43:02 +00:00
Mickaël Rémond
c72cb51c73
* src/mod_announce.erl: Added support to all the announce features described in documentation. Access to all announce features through command line, adhoc commands and disco (Thanks to Badlop) (EJAB-18).
...
* src/gen_mod.erl: Likewise.
* doc/guide.tex: Likewise.
SVN Revision: 858
2007-08-03 08:53:05 +00:00
Alexey Shchepin
7c24a9a400
* src/mod_muc/mod_muc.erl: Added default_room_options option
...
(thanks to Etan Reisner and Badlop)
* src/mod_muc/mod_muc_room.erl: Likewise
* doc/guide.tex: Updated
SVN Revision: 856
2007-08-02 02:30:25 +00:00
Mickaël Rémond
f9221e2212
* src/ejabberd_s2s_out.erl: Avoid bouncing messages twice if terminate happens during open_connect.
...
SVN Revision: 854
2007-08-01 11:25:23 +00:00
Mickaël Rémond
dda2464b85
* src/ejabberd_s2s_out.erl: On terminate, bounce internal process queue and Erlang message queue.
...
SVN Revision: 853
2007-08-01 11:18:52 +00:00
Mickaël Rémond
a1481f27aa
* src/mod_private.erl: Reduce memory consumption on user private storage removal (EJAB-299).
...
SVN Revision: 852
2007-08-01 09:36:30 +00:00
Mickaël Rémond
442dd0667b
* src/xml.erl: Removing debug printout.
...
SVN Revision: 851
2007-07-31 14:47:52 +00:00
Mickaël Rémond
1ab47669ff
* src/xml.erl: Making use of CDATA escaping optional through with a compile time option (EJAB-298).
...
* src/Makefile.in: Likewise.
* src/configure.ac: Likewise.
SVN Revision: 849
2007-07-31 12:05:00 +00:00
Alexey Shchepin
a78ea8fb54
* src/mod_version.erl: Added option to hide OS version (thanks to
...
Badlop)
* doc/guide.tex: Updated
SVN Revision: 848
2007-07-31 04:13:58 +00:00
Alexey Shchepin
588b43f9b7
* src/msgs/zh.msg: Updated (thanks to Shelley Shyan)
...
* src/msgs/es.msg: Updated (thanks to Badlop)
SVN Revision: 847
2007-07-31 04:13:49 +00:00
Alexey Shchepin
db5aa57774
* src/msgs/gl.msg: New galician translation (thanks to
...
Carlos E. Lopez)
SVN Revision: 846
2007-07-31 04:13:39 +00:00
Alexey Shchepin
27a826cfe8
* src/ejabberd_config.erl: Added possibility for appending values
...
to config options (thanks to Badlop)
* doc/guide.tex: Updated
SVN Revision: 845
2007-07-31 04:13:29 +00:00
Mickaël Rémond
bdb2c6820f
* src/xml.erl: Better escaping management with CDATA. We only add CDATA enclosure when needed. CDATA end token is properly escaped.
...
SVN Revision: 844
2007-07-30 17:35:00 +00:00
Mickaël Rémond
af33f13371
* src/xml.erl: Only wrap xmldata nodes in xml cdata "tag" if bigger than 50 bytes. Shorter xmlcdata nodes will be escaped.
...
SVN Revision: 842
2007-07-30 13:13:59 +00:00
Mickaël Rémond
15eee1c604
* src/tls/tls_drv.c: Sends the entire certificate chain (EJAB-209).
...
SVN Revision: 841
2007-07-30 12:29:02 +00:00
Mickaël Rémond
bf6e5a0d26
* src/acl.erl: Remove compilation warnings (EJAB-290).
...
SVN Revision: 840
2007-07-30 11:06:50 +00:00
Mickaël Rémond
e9bbed2299
* src/xml_stream.erl: Group CDATA on a single xmlcdata node (splitting is not relevant as dependant on TCP/IP packet fragmentation) (EJAB-292).
...
SVN Revision: 839
2007-07-30 10:06:49 +00:00
Mickaël Rémond
3f51e73944
* src/xml.erl: Remove compilation warnings (EJAB-290).
...
SVN Revision: 838
2007-07-30 09:09:24 +00:00
Mickaël Rémond
3cd7d1b54b
* src/xml.erl: Removed more code commented out.
...
SVN Revision: 837
2007-07-30 08:36:03 +00:00
Mickaël Rémond
b8cd5c3f0e
* src/xml.erl: Do not crypt binary CData, but enclose the value in
...
XML CDATA "tag".
* src/xml.erl: Code clean-up: removed old code in comments.
SVN Revision: 836
2007-07-30 08:32:47 +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
bf416ad52d
* src/web/ejabberd_web_admin.erl: Code clean-up.
...
SVN Revision: 834
2007-07-26 10:22:44 +00:00
Mickaël Rémond
eee30112ef
* Added TODO comment
...
SVN Revision: 833
2007-07-26 10:13:04 +00:00
Mickaël Rémond
59fa698967
* src/mod_offline.erl: Code clean-up.
...
SVN Revision: 832
2007-07-26 10:08:41 +00:00
Mickaël Rémond
8d9e093788
* src/gen_mod.erl: Throw error more cleanly.
...
SVN Revision: 831
2007-07-26 09:56:38 +00:00
Mickaël Rémond
75448d953d
* src/mod_configure.erl: One ACL call was not virtual host compliant.
...
SVN Revision: 829
2007-07-26 09:49:23 +00:00
Mickaël Rémond
b1a3c639cb
* src/ejabberd_auth_odbc.erl: Fixed wrong call preventing user removal with relational databases.
...
SVN Revision: 828
2007-07-26 09:42:14 +00:00
Mickaël Rémond
9081f1f2b6
* src/mod_last_odbc.erl: Adapted to mod_privacy changes.
...
* src/mod_privacy_odbc.erl: Refactoring to extract records in include file.
SVN Revision: 827
2007-07-26 09:37:16 +00:00
Mickaël Rémond
df57442d75
* src/mod_last.erl: Adapted to mod_privacy changes.
...
SVN Revision: 826
2007-07-26 09:29:52 +00:00
Mickaël Rémond
ad16c0f4a4
* src/mod_last.erl: Adapted to mod_privacy changes.
...
* src/mod_privacy.erl: Refactoring to extract records in include file.
* src/mod_privacy.hrl: Likewise.
SVN Revision: 825
2007-07-26 09:13:31 +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
Mickaël Rémond
637ce31f5e
* src/p1_fsm.erl: Use of catch can break tail recursion.
...
SVN Revision: 823
2007-07-25 08:48:55 +00:00
Mickaël Rémond
6e24711099
* src/ejabberd_s2s_out.erl: Autodisconnect s2s connections which are overloaded (EJAB-287).
...
* src/p1_fsm.erl: Likewise.
SVN Revision: 821
2007-07-24 09:04:09 +00:00
Mickaël Rémond
799ff1d883
* src/ejabberd_s2s_in.erl: Add s2s whitelist / blacklist support on incoming s2s connections (EJAB-283)
...
* src/ejabberd_s2s.erl: Likewise
SVN Revision: 820
2007-07-19 21:17:13 +00:00
Mickaël Rémond
944ef9bbc2
* src/ejabberd_s2s.erl: Fixed typo.
...
SVN Revision: 819
2007-07-18 18:42:00 +00:00
Mickaël Rémond
9da2c78eb4
* src/ejabberd_s2s.erl: Implements s2s hosts whitelist / blacklist
...
* src/ejabberd.cfg.example: Likewise
SVN Revision: 818
2007-07-18 17:42:53 +00:00
Mickaël Rémond
abadd82c66
* src/ejabberd_s2s_out.erl: Make s2s connections more robust
...
* src/ejabberd_s2s.erl: Likewise
SVN Revision: 817
2007-07-18 16:26:50 +00:00
Mickaël Rémond
dcf883005d
* src/mod_configure.erl: Bugfix: Show only virtual host users on admin disco for all users (EJAB-268) (Thanks to Badlop).
...
SVN Revision: 816
2007-07-17 08:21:28 +00:00
Mickaël Rémond
0b0c889bca
* src/mod_muc/mod_muc_log.erl: Recognise more URI schemes in logged HTML (EJAB-279) (Thanks to qu1j0t3).
...
SVN Revision: 815
2007-07-17 07:55:26 +00:00
Mickaël Rémond
1b19d72e6f
* src/ejabberd_s2s_out.erl: Improved place of the INFO / DEBUG printout (EJAB-282).
...
SVN Revision: 814
2007-07-17 07:20:55 +00:00
Mickaël Rémond
745be8373f
* src/odbc/ejabberd_odbc.erl: Better error handling for MySQL native driver (EJAB-224).
...
SVN Revision: 813
2007-07-17 07:09:04 +00:00
Alexey Shchepin
2810c2b300
* src/ejabberd_s2s.erl: Added remove_connection/3
...
* src/ejabberd_s2s_out.erl: Bugfix: remove only own s2s record
SVN Revision: 812
2007-07-15 07:28:47 +00:00
Alexey Shchepin
907878081d
* src/ejabberd_s2s_out.erl: Bounce packets after unregistering s2s
...
connection, not before
SVN Revision: 811
2007-07-11 14:10:28 +00:00
Mickaël Rémond
b16e3f6d0b
* src/mod_echo.erl: mod_echo does not reply to other components. This is to make sure that a component will not discover its own capabilities (EJAB-281).
...
* src/ejabberd.cfg: disable mod_echo in the example config file. mod_echo is mainly a development/test module.
SVN Revision: 810
2007-07-11 08:37:30 +00:00
Mickaël Rémond
3fe646c3cb
* src/odbc/mssql.sql: Nickname cannot be null in rosterusers table (MSSQL)
...
* src/odbc/mysql.sql: Likewise
* src/odbc/pg.sql: Likewise
SVN Revision: 809
2007-07-09 17:22:09 +00:00
Mickaël Rémond
03fde5d50c
* Added missing file.
...
SVN Revision: 807
2007-06-30 06:07:09 +00:00
Mickaël Rémond
221532428f
* src/ejabberd_config.erl: Normalize hostnames in config file. If mixed case is used, the hostname will be now useable (EJAB-277).
...
* src/stringprep/stringprep_sup.erl: Likewise
* src/stringprep/Makefile.in: Likewise
* src/stringprep/Makefile.win32: Likewise
* src/ejabberd_app.erl: Likewise
SVN Revision: 806
2007-06-29 17:27:42 +00:00
Mickaël Rémond
ede1693f20
* src/ejabberd_auth_anonymous.erl: Do not purge non anonymous accounts when using anonymous authentication with another type of auth (EJAB-216).
...
SVN Revision: 805
2007-06-28 17:39:53 +00:00
Mickaël Rémond
525b8e9374
* src/ejabberd_service.erl: Added an option to disable from attribute checks in packets coming from an external component (EJAB-275)
...
* doc/guide.tex: Likewise
SVN Revision: 804
2007-06-28 14:32:48 +00:00
Christophe Romain
d27fbcc27c
corrects EJAB-273, remove obsolete OnlineUsers calculation
...
SVN Revision: 801
2007-06-28 08:31:46 +00:00
Jérôme Sautret
2e00142b38
Cancel revision 798
...
SVN Revision: 799
2007-06-27 11:05:14 +00:00
Jérôme Sautret
9cd3a6db07
Unsafe working version of http file transfer
...
SVN Revision: 798
2007-06-27 10:01:39 +00:00
Alexey Shchepin
ef7e43b2dc
* src/mod_muc/mod_muc_room.erl: Include <body/> in MUC invitations
...
for older clients (thanks to Michael Scherer)
SVN Revision: 796
2007-06-26 18:00:36 +00:00
Mickaël Rémond
20da906311
* src/mod_muc/mod_muc_room.erl: New anti-abuse options: min_presence_interval and min_message_interval (EJAB-227)
...
* doc/guide.tex: Likewise
SVN Revision: 794
2007-06-25 16:43:42 +00:00
Christophe Romain
7ec8ce9e50
apply patch from EJAB-261
...
SVN Revision: 793
2007-06-25 12:09:43 +00:00
Mickaël Rémond
009339a956
* doc/guide.tex: Watchdog alert documentation
...
* src/ejabberd.cfg.example: Likewise
SVN Revision: 790
2007-06-25 07:15:30 +00:00
Alexey Shchepin
57e3d9fda7
* src/mod_irc/mod_irc.erl: Added an option for default IRC
...
encoding (thanks to Badlop)
* doc/guide.tex: Updated
SVN Revision: 789
2007-06-22 15:25:27 +00:00
Alexey Shchepin
a53efc2b05
* src/mod_disco.erl: Don't override accumulated value in
...
get_local_identity/5 (thanks to Magnus Henoch and Badlop)
SVN Revision: 788
2007-06-22 14:15:43 +00:00
Alexey Shchepin
56b5d113a4
* src/web/ejabberd_web_admin.erl: Added links to server and
...
virtual host homes (thanks to Badlop)
SVN Revision: 787
2007-06-22 14:04:45 +00:00
Mickaël Rémond
81117800e8
* src/mod_muc/mod_muc_room.erl: It is now possible to limit who is allowed to create persistent MUC rooms (Thanks to Badlop) (EJAB-257)
...
* src/mod_muc/mod_muc.erl: Likewise
* doc/guide.tex: Likewise
* src/ejabberd.cfg.example: Likewise
SVN Revision: 786
2007-06-20 11:25:19 +00:00
Mickaël Rémond
d2dd6eef09
* src/odbc/odbc_queries.erl: Added missing users_number/1 for MSSQL (EJAB-239).
...
SVN Revision: 785
2007-06-18 10:22:54 +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
241c49dc3c
* src/web/ejabberd_web_admin.erl: Show IP address of connected
...
resources on user info page (thanks to Oleg Palij)
SVN Revision: 781
2007-06-10 18:13:37 +00:00
Alexey Shchepin
3b7e23df5a
* src/ejabberd_config.erl: Fixed "language" option processing
...
(thanks to Badlop)
SVN Revision: 780
2007-06-07 18:27:35 +00:00
Alexey Shchepin
ab0315e592
* src/msgs/zh.msg: Updated (thanks to Shelley Shyan)
...
* src/msgs/ca.msg: New Catalan translation (thanks to Vicent
Alberola)
SVN Revision: 779
2007-06-07 18:17:16 +00:00
Mickaël Rémond
9f48fe49c3
* src/xml.erl: Add new helper function get_subtag_cdata/2.
...
SVN Revision: 778
2007-06-05 01:50:28 +00:00
Alexey Shchepin
b9e790f637
* src/mod_vcard_odbc.erl: Fix for previous commit (thanks to
...
Badlop)
SVN Revision: 777
2007-05-30 21:15:28 +00:00
Mickaël Rémond
5c15f185c2
* src/mod_vcard_odbc.erl: Make service description translatable in discovery (EJAB-236)
...
* src/mod_vcard_ldap.erl: Likewise
SVN Revision: 776
2007-05-29 14:53:09 +00:00
Mickaël Rémond
c228e7aeb3
* src/Makefile.in: Added Dialyzer target (EJAB-189 - Thanks to Geoff Cant)
...
* src/Makefile.in: Build XmppAddr.beam in a single pass
* src/mod_muc/Makefile.in: +debug_info directive support
* src/stringprep/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/web/Makefile.in: Likewise
* src/eldap/Makefile.in: Likewise
* src/mod_pubsub/Makefile.in: Likewise
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_proxy65/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
* src/odbc/Makefile.in: Likewise
SVN Revision: 775
2007-05-29 14:31:12 +00:00
Mickaël Rémond
03740c8bca
* src/mod_vcard.erl: Make services description translatable in discovery (EJAB-236 - thanks to Badlop)
...
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
* src/msgs/fr.msg: Added service description translation
SVN Revision: 774
2007-05-29 13:14:09 +00:00
Alexey Shchepin
c9e139d80a
* src/ejabberdctl.template: Updated version of ejabberdctl (thanks
...
to Christophe Romain)
* tools/ejabberdctl: Likewise
* src/Makefile.in: Updated
SVN Revision: 773
2007-05-21 03:41:13 +00:00
Alexey Shchepin
9a6e8e3c55
* src/ejabberd_sm.erl: Updated the session table to store
...
additional session info
* src/ejabberd_c2s.erl: Report IP address to ejabberd_sm (thanks
to Christophe Romain)
SVN Revision: 772
2007-05-21 03:21:34 +00:00
Alexey Shchepin
06320f429a
* src/msgs/zh.msg: New chinese translation (thanks to Shelley
...
Shyan)
SVN Revision: 771
2007-05-18 13:01:05 +00:00
Alexey Shchepin
8c326ea928
* src/mod_muc/mod_muc_room.erl: Corrected error messages when
...
trying to join members-only room (thanks to Badlop)
* src/ejabberd_c2s.erl: Added c2s_update_presence hook
SVN Revision: 770
2007-05-16 10:13:04 +00:00
Alexey Shchepin
897cc13f42
* src/ejd2odbc.erl: Bugfix (thanks to Badlop)
...
SVN Revision: 769
2007-05-15 00:07:25 +00:00
Alexey Shchepin
b444faaf89
* src/ejd2odbc.erl: Bugfix (thanks to Badlop)
...
SVN Revision: 768
2007-05-13 22:41:19 +00:00
Alexey Shchepin
a087c00a92
* src/mod_stats.erl: Updated
...
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 767
2007-05-12 18:14:21 +00:00
Alexey Shchepin
8aab10d28c
* src/ejabberd_auth.erl: Added get_vh_registered_users_number/1
...
function
* src/ejabberd_auth_odbc.erl: Likewise
* src/odbc/odbc_queries.erl: Added users_number/1 function
* src/ejabberd.cfg.example: Added an example for
pgsql_users_number_estimate option
SVN Revision: 766
2007-05-12 18:09:38 +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
737bb8888a
* src/mod_muc/mod_muc.erl: Bugfix
...
SVN Revision: 764
2007-05-09 14:47:58 +00:00
Alexey Shchepin
396b945d20
* src/ejabberd_receiver.erl: Workaround for inet_drv bug
...
* src/web/ejabberd_http_poll.erl: Added sockname/1 and peername/1
stubs
SVN Revision: 763
2007-05-07 17:52:35 +00:00
Alexey Shchepin
32613987a8
* src/web/ejabberd_http.hrl: Added "ip" field in the "request"
...
record
* src/web/ejabberd_http.erl: Likewise
SVN Revision: 762
2007-05-07 15:47:33 +00:00
Alexey Shchepin
372944df6c
* src/ejabberd_sm.erl: Added set_presence_hook
...
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 761
2007-05-03 15:45:24 +00:00
Alexey Shchepin
ab0d7b9151
* src/ejabberd_sm.erl: Added set_presence_hook
...
SVN Revision: 760
2007-05-03 07:41:16 +00:00
Alexey Shchepin
2ae5d13ab8
* src/ejabberd_sm.erl: Added check for existence of incoming
...
subscription destination
SVN Revision: 759
2007-05-03 05:15:12 +00:00
Alexey Shchepin
acdb78c28a
* src/msgs/it.msg: Added italian translation (thanks to Luca
...
Brivio)
SVN Revision: 758
2007-05-03 04:29:35 +00:00
Alexey Shchepin
b9e7fa2ef1
* src/mod_muc/mod_muc_room.erl: More accurate invitation errors
...
(thanks to Magnus Henoch)
SVN Revision: 757
2007-05-03 04:07:29 +00:00