Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity
1,173 Commits 7 Branches 109 Tags 66 MiB
37fc28ef49
Commit Graph

931 Commits

Author SHA1 Message Date
Christophe Romain
23b91e953a pubsub disco_sm_items bugfix 
SVN Revision: 1051
 2007-12-08 15:24:38 +00:00
Alexey Shchepin
d788bd1a27 * src/ejabberd_sm.erl: Bugfix 
SVN Revision: 1050
 2007-12-07 20:57:44 +00:00
Badlop
791640fc98 * src/Makefile.in: Fix compilation warnings: Part 5: To fix a 
warning about behaviour undefined, the erlang module that
implements the behaviour must be compiled before the module that
uses such behaviour (EJAB-290)

SVN Revision: 1049
 2007-12-07 08:44:22 +00:00
Badlop
dd706eea94 * src/eldap/eldap.erl: Fix compilation warnings: Part 4 (EJAB-290) 
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 1048
 2007-12-07 01:40:24 +00:00
Badlop
95c69b0251 * src/mod_irc/iconv.erl: Fix compilation warnings: 3 (EJAB-290) 
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_irc/mod_irc_connection.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/stringprep/stringprep.erl: Likewise
* src/web/ejabberd_http.erl: Likewise
* src/web/ejabberd_http_poll.erl: Likewise

SVN Revision: 1047
 2007-12-07 00:48:11 +00:00
Badlop
b7c0a89a79 * src/mod_caps.erl: Fix compilation warnings: Part 2 (EJAB-290) 
* src/mod_configure.erl: 
* src/mod_configure2.erl: 
* src/mod_offline_odbc.erl: 
* src/mod_shared_roster.erl: 
* src/mod_stats.erl: 
* src/mod_version.erl:

SVN Revision: 1046
 2007-12-07 00:09:48 +00:00
Badlop
6342c258a7 * src/cyrsasl.erl: Fix compilation warnings: Part 1 (EJAB-290) 
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_config.erl: Likewise
* src/ejabberd_hooks.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_sm.erl: Likewise
* src/idna.erl: Likewise
* src/jd2ejd.erl: Likewise

SVN Revision: 1045
 2007-12-06 23:15:04 +00:00
Badlop
d625fc80fc * src/acl.erl and other 64 files: Remove Erlang module attribute 
'vsn' because it doesn't provide any worth feature, and it
difficults hot code update (EJAB-440)

SVN Revision: 1044
 2007-12-06 22:12:27 +00:00
Badlop
e79aa93d88 * src/ejabberdctl.cfg.example: Explain that each connection uses 
two or three ports (thanks to Max Loparyev)

SVN Revision: 1043
 2007-12-06 21:42:47 +00:00
Badlop
dfa74082f8 * src/configure: Regenerated 
* doc/dev.html: Likewise
* doc/features.html: Likewise
* doc/guide.html: Likewise
* doc/version.tex: Likewise

* doc/introduction.tex: Updated number of translated languages

SVN Revision: 1042
 2007-12-06 19:47:49 +00:00
Badlop
2e732b8b23 * src/web/ejabberd_web_admin.erl: Support more native acl_type on 
web interface (EJAB-253)

SVN Revision: 1041
 2007-12-06 18:54:18 +00:00
Badlop
60ea99d1a3 * src/ejabberd_c2s.erl: Increase the timeout of open socket 
without authentication to 60 seconds because many Jabber clients
are not yet capable of handling this correctly (EJAB-355)

SVN Revision: 1040
 2007-12-06 17:42:25 +00:00
Badlop
4049906d5b * src/Makefile.in: Allow compilation with HiPE, disabled by 
default, undocumented and unrecommended because it is experimental
and doesn't seem to provide meaningful gains currently (thanks to
Samuel Tardieu) (EJAB-412)
* src/configure.ac: Likewise

SVN Revision: 1039
 2007-12-06 17:14:39 +00:00
Badlop
9527f3c9b1 * src/Makefile.in: Allow compilation with HiPE (EJAB-412) 
* src/configure.ac: Likewise

SVN Revision: 1038
 2007-12-06 17:09:35 +00:00
Badlop
10c6f3d991 * src/msgs/cs.msg: Updated (thanks to Lukáš Polívka alias 
Spike411)

SVN Revision: 1037
 2007-12-06 16:04:46 +00:00
Badlop
fc8c92a233 * src/mod_muc/mod_muc.erl: Catch creation of table 
muc_online_users: it may be already created by other mod_muc
instance

SVN Revision: 1036
 2007-12-06 15:40:21 +00:00
Badlop
386f432977 * doc/Makefile: Remove bashism 
* doc/guide.tex: Document how to change computer
hostname (EJAB-320)

SVN Revision: 1034
 2007-12-06 15:26:53 +00:00
Badlop
4f78230dd8 * src/web/ejabberd_http.erl: Change loglevel for http 
queries (EJAB-363)
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 1033
 2007-12-06 11:24:57 +00:00
Badlop
6c0e4820d8 * doc/guide.tex: Add mod_caps and improve mod_pubsub documentation 
* src/ejabberd.cfg.example: Added mod_caps enabled by default

SVN Revision: 1032
 2007-12-06 11:13:29 +00:00
Christophe Romain
c90579146c enable pep by default and add pubsub plugin examples 
SVN Revision: 1031
 2007-12-06 09:29:28 +00:00
Badlop
749a4305b4 * doc/guide.tex: Document the Debug Console (EJAB-395) 
SVN Revision: 1030
 2007-12-06 00:31:09 +00:00
Badlop
5f9de28973 * src/ejabberdctl.template: The parameter 'kernel inetrc' is used 
even with -sname to guarantee the same behaviour that when using
-name (EJAB-317)

SVN Revision: 1029
 2007-12-05 23:58:38 +00:00
Badlop
353a61ce1c * doc/guide.tex: Improvements in sections: Start, Creating Initial 
Account, Module Overview, Managing an ejabberd server, and
Debugging

SVN Revision: 1028
 2007-12-05 23:46:50 +00:00
Badlop
720b57a235 * doc/guide.tex: Added explanations about epmd, cookie and node 
name (EJAB-251)

SVN Revision: 1027
 2007-12-05 18:53:09 +00:00
Badlop
1e1f15aa61 * src/msgs/zh.msg: Updated (thanks to Shelley Shyan) 
SVN Revision: 1026
 2007-12-05 11:59:12 +00:00
Badlop
536a120c9d * src/mod_muc/mod_muc_room.erl: Rephrase the invitation sentence 
to make more natural

SVN Revision: 1025
 2007-12-05 09:09:09 +00:00
Badlop
3a80aa24a8 * src/msgs/es.msg: Updated 
SVN Revision: 1024
 2007-12-05 00:59:33 +00:00
Badlop
2208d78782 * src/ejabberd.hrl: Set more proper version number 
SVN Revision: 1023
 2007-12-05 00:31:30 +00:00
Badlop
c30ddd3a07 * contrib/extract_translations/extract_translations.erl: Don't 
report [] to be translated. Identify unusued strings.

SVN Revision: 1022
 2007-12-04 23:41:52 +00:00
Badlop
2e1bb5f0e6 * .gitignore: Removed (EJAB-441) 
* src/.cvsignore: Likewise

SVN Revision: 1021
 2007-12-04 21:40:25 +00:00
Badlop
d3a86d7660 * src/mod_pubsub/mod_pubsub.erl: Fixed URI. 
SVN Revision: 1020
 2007-12-04 21:35:41 +00:00
Badlop
1724ee2b15 * src/mod_pubsub/mod_pubsub.erl: Bugfix: don't report the Jabber 
server as a pubsub service.

SVN Revision: 1019
 2007-12-04 11:38:00 +00:00
Mickaël Rémond
f8c4e86977 * ChangeLog: Fix conflict. 
SVN Revision: 1018
 2007-12-03 10:51:22 +00:00
Mickaël Rémond
1795c1a7bb * ChangeLog: Update. 
SVN Revision: 1017
 2007-12-03 10:51:06 +00:00
Mickaël Rémond
384f4c9196 * src/mod_muc.erl: Added option to limit the number of room a user is 
allowed to connect to (EJAB-445).
* src/mod_muc_room.erl: Likewise.
* doc/guide.tex: Likewise.

SVN Revision: 1016
 2007-12-03 10:50:36 +00:00
Badlop
4ed283f009 * src/ejabberdctl.cfg.example: Bugfix in kernel poll. Added SMP 
option. Reorganization of options
* src/ejabberdctl.template: Added SMP option

SVN Revision: 1014
 2007-12-02 21:13:25 +00:00
Badlop
bfb7583bb2 * src/Makefile.in: New options make uninstall and 
uninstall-all (EJAB-293)

SVN Revision: 1013
 2007-12-02 01:03:18 +00:00
Mickaël Rémond
b84f85ba8a * doc/Makefile: echo seems to interpret \n and \v under MacOSX 
Leopard. I fixed the problem but let me know if it breaks build
chain in other contexts.

SVN Revision: 1011
 2007-12-01 16:43:04 +00:00
Mickaël Rémond
4f9e510cd5 * ChangeLog: Updated. 
SVN Revision: 1010
 2007-12-01 16:08:05 +00:00
Mickaël Rémond
43e31b1bf0 * src/tls/Makefile.win32: Updated for latest Win32 OpenSSL library. 
SVN Revision: 1008
 2007-12-01 15:14:41 +00:00
Mickaël Rémond
7d68866c59 * src/odbc_queries.erl: Added a default define value so that we 
can recompile the file manually with a simple erlc command (with the
default generic value).

SVN Revision: 1007
 2007-12-01 14:25:31 +00:00
Alexey Shchepin
c61d10f28a * src/mod_pubsub/Makefile.in: Removed mod_pubsub_old mentioning 
* src/mod_pubsub/Makefile.win32: Likewise

SVN Revision: 1006
 2007-12-01 14:11:46 +00:00
Alexey Shchepin
9b2e6bcaef * src/odbc/odbc_queries.erl: Reverted the previous patch because 
it produces "redefining macro 'generic'" compilation error

SVN Revision: 1005
 2007-12-01 05:20:45 +00:00
Alexey Shchepin
c3c782d882 * src/mod_caps.erl: CAPS support (thanks to Magnus Henoch) 
* src/ejabberd_local.erl: Support for IQ responses
* src/jlib.erl: Added iq_query_or_response_info/1 function
* src/jlib.hrl: Added NS_PUBSUB_ERRORS and NS_CAPS

* src/mod_pubsub/Makefile.in: New pubsub+pep implementation
(thanks to Christophe Romain and Magnus Henoch)
* src/ejabberd_sm.erl: Added get_session_pid/3 function
* src/ejabberd_c2s.erl: Added get_subscribed_and_online/1 function

SVN Revision: 1004
 2007-12-01 05:16:30 +00:00
Mickaël Rémond
e4cf286aa2 * src/odbc_queries.erl: Added a default define value so that we can 
recompile the file manually with a simple erlc command.

SVN Revision: 1003
 2007-11-30 18:06:26 +00:00
Badlop
02db5aa005 * src/mod_vcard.erl: Add type of x:data field to search 
results (thanks to Robin Redeker) (EJAB-327)
* src/mod_vcard_ldap.erl: 
* src/mod_vcard_odbc.erl:

SVN Revision: 1002
 2007-11-29 18:24:31 +00:00
Badlop
dbdcadb6b3 * src/aclocal.m4: Fix autoconf caching for SSL libraries (thanks 
to Michael Shields) (EJAB-439)

* src/configure.ac: Don't hardcode gcc and gcc options in
Makefiles (thanks to Etan Reisner) (EJAB-436)

SVN Revision: 1001
 2007-11-29 17:22:34 +00:00
Badlop
44d65ff303 * src/configure.ac: Don't hardcode gcc and options (EJAB-436) 
* src/Makefile.in: 
* src/ejabberd_zlib/Makefile.in: 
* src/eldap/Makefile.in: 
* src/mod_irc/Makefile.in: 
* src/mod_muc/Makefile.in: 
* src/mod_proxy65/Makefile.in: 
* src/mod_pubsub/Makefile.in: 
* src/odbc/Makefile.in: 
* src/pam/Makefile.in: 
* src/stringprep/Makefile.in: 
* src/tls/Makefile.in: 
* src/web/Makefile.in:

SVN Revision: 1000
 2007-11-29 16:59:35 +00:00
Badlop
4257f0c790 * src/mod_muc/mod_muc_room.erl: Hide the option 'Make room 
moderated' because it isn't implemented, and set the default value
of 'moderated' to true because that is the behaviour
implemented (EJAB-419)

SVN Revision: 999
 2007-11-29 16:16:10 +00:00
Badlop
6697c6153f * doc/guide.tex: It should be made more clear that domain_certfile 
works for both s2s and c2s connections (EJAB-212). Added another
example of listening ports.

SVN Revision: 998
 2007-11-28 17:16:36 +00:00
Badlop
0996e569a6 * doc/guide.tex: Update URI of ejabberd official home page, URI 
of ejabberd.jabber.ru, and copyright dates (EJAB-366)
* doc/introduction.tex: 
* src/ejabberd.hrl: 
* src/ejabberd_admin.erl: 
* src/mod_irc/mod_irc.erl: 
* src/mod_irc/mod_irc_connection.erl: 
* src/mod_muc/mod_muc.erl: 
* src/mod_muc/mod_muc_log.erl: 
* src/mod_proxy65/mod_proxy65_service.erl: 
* src/mod_pubsub/mod_pubsub.erl: 
* src/mod_vcard.erl: 
* src/mod_vcard_ldap.erl: 
* src/mod_vcard_odbc.erl: 
* src/msgs/*.msg: 
* src/web/ejabberd_web_admin.erl:

SVN Revision: 997
 2007-11-27 23:35:26 +00:00
Badlop
69b425aeb7 * src/gen_mod.erl: Update in database the configuration changes in 
modules (EJAB-330)

SVN Revision: 996
 2007-11-27 22:30:51 +00:00
Badlop
eb330ac0e0 * src/mod_configure.erl: The command get-user-lastlogin is now 
compatible with both Mnesia and ODBC (EJAB-383)
* src/mod_last.erl: Likewise
* src/mod_last_odbc.erl: Likewise

SVN Revision: 995
 2007-11-27 18:54:06 +00:00
Badlop
0ef2886b7e * doc/guide.tex: Document ejabberd_http's 
request_handlers (EJAB-372). Fixed small Latex problems.
Sort options of listening sockets.

SVN Revision: 994
 2007-11-27 18:40:09 +00:00
Badlop
003e7ae9a2 * doc/guide.tex: Document ejabberd_http's 
request_handlers (EJAB-372). Fixed small Latex problems.

SVN Revision: 993
 2007-11-27 18:22:47 +00:00
Alexey Shchepin
7ad9874dba * src/mod_announce.erl: Bugfix (thanks to Christophe Romain) 
SVN Revision: 992
 2007-11-27 15:18:45 +00:00
Badlop
e000cbb034 * doc/guide.tex: Added clarification about LDAP default port 
(thanks to Christophe Romain).

SVN Revision: 991
 2007-11-27 14:45:30 +00:00
Badlop
b4997bc20c * src/mod_vcard.erl: Ensure mod_vcard to respect FORM_TYPE registry (EJAB-328). 
* src/mod_vcard_ldap.erl: Likewise.
* src/mod_vcard_odbc.erl: Likewise.
* doc/guide.tex: Updated documentation.

SVN Revision: 990
 2007-11-27 14:06:44 +00:00
Badlop
e7136065fc * src/mod_muc/mod_muc_room.erl: Don't show the room name as the room description (EJAB-382). 
SVN Revision: 989
 2007-11-27 08:09:47 +00:00
Badlop
eb488b48fb * src/ejabberd.cfg.example: Added example configuration of databases. 
SVN Revision: 988
 2007-11-26 21:29:14 +00:00
Badlop
f397741d20 * doc/guide.tex: Fixed several typos. 
SVN Revision: 987
 2007-11-26 19:54:30 +00:00
Badlop
2078c45656 * src/ejabberd_config.erl: Print error when the configuration 
requires ODBC, MySQL or PostgreSQL libraries but are not 
installed (EJAB-210).

SVN Revision: 986
 2007-11-26 19:52:09 +00:00
Badlop
f6848603f9 * src/web/ejabberd_web_admin.erl: Added a favicon (EJAB-379). 
SVN Revision: 985
 2007-11-26 15:12:34 +00:00
Badlop
7f66b3dfb3 * src/msgs/wa.msg: New Walon translation (thanks to 
Pablo Saratxaga) (EJAB-374).

SVN Revision: 984
 2007-11-26 15:03:11 +00:00
Badlop
2bf29183f5 * doc/guide.tex: Describe how ejabberd treats ejabberd.cfg file 
(EJAB-384).

SVN Revision: 983
 2007-11-26 14:52:11 +00:00
Badlop
174c16a15f * src/ejabberd.cfg.example: Huge reorganization and grouping of options (EJAB-392). 
SVN Revision: 982
 2007-11-26 14:35:53 +00:00
Badlop
731e9cc0e5 * doc/guide.tex: Describe in mod_muc: nick register and service admin message (EJAB-400). 
SVN Revision: 981
 2007-11-26 10:23:37 +00:00
Badlop
9a03e5087e * src/mod_echo.erl: Example function that demonstrates how to receive XMPP packets using Erlang's message passing mechanism (EJAB-247). 
SVN Revision: 980
 2007-11-26 10:15:18 +00:00
Badlop
87f7630fa3 * src/ejabberdctl.template: Write erl_crash.dump in the log/ directory, with unique filename (EJAB-433). 
SVN Revision: 979
 2007-11-26 08:57:21 +00:00
Badlop
399604e55d * src/ejabberdctl.template: Removed bashisms (EJAB-399). Set environment variables instead of passing parameters when calling erl (EJAB-421). 
* src/ejabberd_ctl.erl: Improvements in the help messages (EJAB-399).

* doc/guide.tex: Improvements in sections ejabberdctl, and Install from Source (EJAB-399).

SVN Revision: 978
 2007-11-26 07:59:35 +00:00
Alexey Shchepin
a487652fe9 * src/ejabberd_router.erl: Bugfix 
SVN Revision: 977
 2007-11-25 16:39:56 +00:00
Alexey Shchepin
950060cd3c * src/ejabberd_s2s_out.erl: Bugfix 
SVN Revision: 976
 2007-11-25 16:14:32 +00:00
Alexey Shchepin
65a7bb7d2a * src/ejabberd_sm.erl: Optimized check_max_sessions (thanks to 
Christophe Romain)

SVN Revision: 975
 2007-11-25 15:35:20 +00:00
Mickaël Rémond
1415fa4b1c * src/ejabberd_config.erl: Improved error message when ejabberd 
config file is not found.

SVN Revision: 974
 2007-11-22 13:46:54 +00:00
Mickaël Rémond
f250ee9de6 * examples/extauth/check_pass_null.pl: Fixed external 
authentication example script (EJAB-404)

SVN Revision: 973
 2007-11-22 13:46:50 +00:00
Christophe Romain
d7d34f87e7 Better count management and batch users retrieval internal database 
SVN Revision: 972
 2007-11-16 13:58:00 +00:00
Mickaël Rémond
76f7e643e3 * src/ejabberd_config.erl: Refactoring: Move internal data structure to an include file. 
* src/ejabberd_config.hrl: Likewise.

SVN Revision: 969
 2007-11-09 10:18:38 +00:00
Mickaël Rémond
d6967f2745 * src/ejabberd_auth.erl: Better count management and batch users retrieval for relational database (Thanks to Massimiliano Mirra). 
* src/ejabberd_auth_odbc.erl: Likewise.
* src/odbc/odbc_queries.erl: Likewise.

SVN Revision: 968
 2007-11-03 17:35:23 +00:00
Mickaël Rémond
a32e815bcb * ChangeLog: Fixed typo. 
SVN Revision: 967
 2007-11-02 14:59:06 +00:00
Mickaël Rémond
08cfab8a06 * src/web/ejabberd_http_poll.erl: Refactoring. Moved c2s limits acquisition to a separate module. 
* src/ejabberd_c2s_config.erl: Likewise.

SVN Revision: 966
 2007-11-02 14:45:06 +00:00
Mickaël Rémond
426f6072dc * src/web/ejabberd_http_poll.erl: Support for c2s ACL access, 
max_stanza and shaper on http_bind connections (EJAB-243,
EJAB-415, EJAB-416)

SVN Revision: 965
 2007-11-01 13:59:29 +00:00
Mickaël Rémond
c3fc888c9f * ChangeLog: Added missing info about last commits in ChangeLog. 
SVN Revision: 964
 2007-11-01 13:49:50 +00:00
Christophe Romain
c167c80f6d Bugfix on previous change (EJAB-380) 
SVN Revision: 960
 2007-10-17 08:51:35 +00:00
Alexey Shchepin
0d557566fb * src/ejabberdctl.template: Several improvements (EJAB-380) 
(thanks to Sander Devrieze, Sergei Golovan, Torsten Werner and
Badlop)
* src/ejabberdctl.cfg.example: Likewise
* src/ejabberd.inetrc: Likewise
* src/Makefile.in: Likewise

SVN Revision: 959
 2007-10-17 02:33:19 +00:00
Alexey Shchepin
7583eef401 * src/mod_privacy.erl: Bugfix 
SVN Revision: 958
 2007-10-17 02:19:44 +00:00
Alexey Shchepin
5f41b6c6f1 * src/mod_vcard_odbc.erl: Reverted previous change 
SVN Revision: 957
 2007-10-07 10:52:45 +00:00
Alexey Shchepin
a3380daa79 * src/mod_vcard_odbc.erl: Bugfix 
SVN Revision: 956
 2007-10-06 17:52:12 +00:00
Alexey Shchepin
5ab52e2712 * src/mod_offline_odbc.erl: Bugfix 
SVN Revision: 955
 2007-10-06 17:35:15 +00:00
Alexey Shchepin
63487ff7b2 * src/ejabberd_auth_pam.erl: Support for PAM authentication 
(thanks to Evgeniy Khramtsov)
* src/ejabberd.cfg.example: Likewise
* src/configure.ac: Likewise
* src/aclocal.m4: Likewise
* src/Makefile.in: Likewise
* examples/ejabberd.pam: Likewise
* doc/guide.tex: Likewise

SVN Revision: 953
 2007-10-01 10:33:03 +00:00
Christophe Romain
665abff588 Added some missing NOT NULL restrictions 
SVN Revision: 952
 2007-09-28 13:33:27 +00:00
Christophe Romain
0bb936f848 apply rootdir patch from Badlop (EJAB-385) 
SVN Revision: 951
 2007-09-27 12:32:05 +00:00
Alexey Shchepin
f82b84158e * src/ejabberd_s2s.erl: Max number of connections and max number 
of connections per node now can be specified via
max_s2s_connections and max_s2s_connections_per_node acl rules

SVN Revision: 950
 2007-09-25 16:32:18 +00:00
Mickaël Rémond
4b2bd22533 * ChangeLog: Integration of multiple s2s support (EJAB-360). 
SVN Revision: 949
 2007-09-14 14:21:41 +00:00
Alexey Shchepin
e809c6c322 * src/gen_mod.erl: Added get_module_opt_host/3 (thanks to Badlop) 
SVN Revision: 927
 2007-09-11 11:20:36 +00:00
Alexey Shchepin
b5465a3f90 SVN Revision: 926 2007-09-11 11:19:12 +00:00
Mickaël Rémond
cccd2ab567 * ChangeLog: updated. 
SVN Revision: 925
 2007-09-10 16:15:36 +00:00
Mickaël Rémond
8cd1adec4b * ChangeLog: Document latest commits. 
SVN Revision: 923
 2007-09-06 07:45:09 +00:00
Alexey Shchepin
ef57d79093 * src/mod_offline_odbc.erl: Bugfix 
SVN Revision: 920
 2007-09-04 22:12:33 +00:00
Mickaël Rémond
43fe376d67 * ChangeLog: Update. 
SVN Revision: 919
 2007-09-04 07:56:17 +00:00
Mickaël Rémond
036887f082 * examples/extauth/check_pass_null.pl: Perl is generally available 
as a default in most Linux distributions.

SVN Revision: 915
 2007-09-03 08:51:12 +00:00
Alexey Shchepin
5994816a27 * src/jlib.erl: Removed http_base_64:decode call 
SVN Revision: 908
 2007-09-02 15:56:17 +00:00
Alexey Shchepin
978b7aea12 * src/mod_muc/mod_muc_room.erl: Added logging of MUC admin/owner 
queries

SVN Revision: 907
 2007-09-01 21:15:40 +00:00
Alexey Shchepin
722563ed94 * src/mod_muc/mod_muc_room.erl: Added user_message_shaper and 
room_shaper options
* src/mod_muc/mod_muc.erl: Likewise

SVN Revision: 906
 2007-09-01 21:05:04 +00:00
Mickaël Rémond
4b63b03718 * ChangeLog: Missing commit. 
SVN Revision: 905
 2007-08-31 16:41:33 +00:00
Mickaël Rémond
ae8fd17287 * doc/guide.tex: Documentation for mod_muc option for server-wide limitation of the maximum number of users per room (EJAB-344). 
* doc/guide.tex: Documentation for mod_muc option to allow admin
to enter room even if the maximum number of users
reached (EJAB-345).

SVN Revision: 903
 2007-08-31 16:41:27 +00:00
Mickaël Rémond
2c57215904 * src/web/ejabberd_web_admin.erl: Make the web interface pages 
"translatable" (Thanks to Badlop) (EJAB-11).

SVN Revision: 902
 2007-08-31 16:13:35 +00:00
Alexey Shchepin
6cc2042fec * src/ejabberd.cfg.example: Updated mod_muc 'host' option default 
value (thanks to Badlop)

SVN Revision: 901
 2007-08-29 18:29:07 +00:00
Alexey Shchepin
4a26e75992 * src/mod_muc/mod_muc_room.erl: The mod_muc option max_users now 
limits max number of users in rooms and max_users_admin_threshold
sets a number of admin or owner accounts allowd to join after
max_users occupants

SVN Revision: 900
 2007-08-29 17:54:45 +00:00
Mickaël Rémond
8bf6a88279 * doc/guide.tex: Documentation for XML based optimisation build time option (EJAB-298) 
SVN Revision: 897
 2007-08-29 16:12:59 +00:00
Alexey Shchepin
90ff184472 * src/mod_muc/mod_muc_log.erl: Added missed HTMLization in a 
nickname change logging (thanks to Badlop)

SVN Revision: 896
 2007-08-29 13:17:03 +00:00
Mickaël Rémond
52c10089aa * src/mod_muc/mod_muc_room.erl: Changed default max number of user 
in a room to 200 (EJAB-248)

SVN Revision: 895
 2007-08-28 15:05:52 +00:00
Mickaël Rémond
4221a50c80 * src/ChangeLog: Missing commit. 
SVN Revision: 894
 2007-08-28 14:37:17 +00:00
Mickaël Rémond
a78037fc3c * src/mod_muc/mod_muc_room.erl: Implements muc max users option 
from XEP-0045 (Thanks to Jerome Sautret) (EJAB-248).

SVN Revision: 892
 2007-08-28 14:35:50 +00:00
Mickaël Rémond
f314acd142 * ChangeLog: Fixed attibution to commiter. 
SVN Revision: 891
 2007-08-28 14:33:31 +00:00
Alexey Shchepin
0015804d97 * doc/guide.tex: Described @HOST@ feature (thanks to Badlop) 
SVN Revision: 890
 2007-08-27 21:48:06 +00:00
Alexey Shchepin
e21da18c87 * doc/guide.tex: Removed mentions of unexistent 'hosts' modules 
option (thanks to Badlop)

SVN Revision: 889
 2007-08-25 22:48:16 +00:00
Alexey Shchepin
5dfa6edda3 * src/gen_mod.erl: Substitute @HOST@ with hostname in the 'host' 
option (thanks to Badlop)
* src/mod_vcard.erl: Likewise
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard_odbc.erl: Likewise
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_echo.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise

SVN Revision: 888
 2007-08-25 17:24:00 +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
Alexey Shchepin
262cff552b SVN Revision: 880 2007-08-20 17:35:12 +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
c15225abc8 * doc/guide.tex: Added documentation for the mod_offline quota 
(EJAB-314).
* doc/guide.tex: Remove release notes (EJAB-323).

SVN Revision: 875
 2007-08-13 14:13:44 +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
Alexey Shchepin
b1b348e184 * doc/guide.tex: Minor update (thanks to Sergei Golovan) 
SVN Revision: 862
 2007-08-09 08:03:00 +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
bd00eb8898 * 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: 857
 2007-08-02 03:02:25 +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
d5e14e686a * doc/guide.tex: Front page table formatting that render correctly in HTML and update mentionning CEAN as a way to install ejabberd (Thanks to Badlop) (EJAB-272). 
SVN Revision: 855
 2007-08-01 18:09:00 +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
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
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
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
83397fdc45 * src/mod_configure.erl: One ACL call was not virtual host compliant. 
SVN Revision: 830
 2007-07-26 09:52:28 +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
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
be494565a9 * doc/guide.tex: Added recommandations on max_stanza options usage. 
SVN Revision: 822
 2007-07-24 09:17:29 +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
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
Mickaël Rémond
12ab036236 * doc/guide.tex: Documentation rework started (EJAB-272) 
* doc/introduction.tex: Likewise

SVN Revision: 803
 2007-06-28 09:16:21 +00:00
Christophe Romain
b7e16968b6 add ChangeLog entry for r801 
SVN Revision: 802
 2007-06-28 09:08:06 +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
6c3a79f9df * doc/guide.tex: Typos 
SVN Revision: 795
 2007-06-25 17:44:48 +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
Mickaël Rémond
6a6c6adf5d * doc/guide.tex: Documentation improvements on watchdog 
SVN Revision: 792
 2007-06-25 07:45:50 +00:00
Mickaël Rémond
e8308beb47 * doc/guide.text: No need to escape underscore in Latex verbatim sections 
SVN Revision: 791
 2007-06-25 07:41:25 +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