Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-02 16:37:52 +01:00
Code Releases Activity
3,224 Commits 7 Branches 109 Tags 66 MiB
099f7d6521
Commit Graph

333 Commits

Author SHA1 Message Date
Badlop
97ee31e751 Allow content types to be configured in ejabberd.cfg (EJAB-975)(thanks to Brian Cully) 
SVN Revision: 2377
 2009-07-21 17:32:29 +00:00
Badlop
338af10aaf moved some log reports from error to debug level (thanks to Evgeniy Khramtsov) 
SVN Revision: 2374
 2009-07-20 09:21:42 +00:00
Badlop
020a3e6d6b Revert workaround of EJAB-611 because it seems no longer required (EJAB-709) 
SVN Revision: 2371
 2009-07-17 21:47:26 +00:00
Badlop
e37b26e068 Improvements in the WebAdmin browsing menus. 
SVN Revision: 2336
 2009-06-25 17:04:03 +00:00
Badlop
6ac4157fc1 Add Vim folding 
SVN Revision: 2335
 2009-06-23 21:13:04 +00:00
Badlop
b9cbb7a72b Detect auth errors and report in log file. Support auth when domain not provided. 
SVN Revision: 2331
 2009-06-22 23:14:18 +00:00
Badlop
13c76c12f8 Workaround to compile with exmpp 
SVN Revision: 2324
 2009-06-16 18:28:06 +00:00
Badlop
b49f8a81a8 Add forgotten copyright and license notices. 
SVN Revision: 2321
 2009-06-16 18:27:51 +00:00
Badlop
ab5b66facc Easier debugging (EJAB-936)(thanks to Michael Remond) 
SVN Revision: 2320
 2009-06-16 18:27:45 +00:00
Badlop
35c6ea68cc Code clean-up (EJAB-936)(thanks to Michael Remond) 
SVN Revision: 2319
 2009-06-16 18:27:40 +00:00
Badlop
b74cb8828b Started code clean-up (EJAB-936)(thanks to Michael Remond) 
SVN Revision: 2318
 2009-06-16 18:27:35 +00:00
Badlop
a1b84c6fa3 Replaced sha1 to hexadecimal transformation with sha:sha/1 call (thanks to Alexey Shchepin) 
SVN Revision: 2317
 2009-06-16 18:27:31 +00:00
Badlop
3e3d01063d Replace TYPE/1 with is_TYPE/1 (EJAB-922) 
SVN Revision: 2316
 2009-06-16 18:27:27 +00:00
Badlop
c19cc61c48 Simplified code.(thanks to Michael Remond) 
SVN Revision: 2315
 2009-06-16 18:27:24 +00:00
Badlop
5854edafdd Properly warn user and admin when mod_http_bind is not started.(thanks to Michael Remond) 
SVN Revision: 2314
 2009-06-16 18:27:18 +00:00
Badlop
2c33e72eea Do not clear input when dispatching a get when we have nothing to output. (thanks to Geoff Cant) 
SVN Revision: 2313
 2009-06-16 18:27:14 +00:00
Badlop
24ab5026c9 Changed the place where database is created(thanks to Michael Remond) 
SVN Revision: 2312
 2009-06-16 18:27:10 +00:00
Badlop
c74ef80f79 Fix remote-stream-error stanzas 
SVN Revision: 2311
 2009-06-16 18:27:05 +00:00
Badlop
eeb11046d5 New option max_inactivity to configure maximum inactivity period (EJAB-512) 
SVN Revision: 2310
 2009-06-16 18:27:01 +00:00
Badlop
66f3f0f3de Fix warning of unused Host variable 
SVN Revision: 2309
 2009-06-16 18:26:57 +00:00
Badlop
a1bce24461 Include condition in http-bind terminate body when service stops (EJAB-792) 
SVN Revision: 2308
 2009-06-16 18:26:53 +00:00
Badlop
1c2d0afd95 Fix unknown rid error (thanks to Jerome Sautret) 
SVN Revision: 2307
 2009-06-16 18:26:48 +00:00
Badlop
6e52ca3f4e Implement packets reordering to avoid race conditions (EJAB-724).(thanks to Michael Remond) 
SVN Revision: 2306
 2009-06-16 18:26:44 +00:00
Badlop
1d1f72fdc2 Updated IP retrieving (thanks to Alexey Shchepin) 
SVN Revision: 2305
 2009-06-16 18:26:40 +00:00
Badlop
d25bd8c1c6 Improve ip fetching patch (thanks to Christohpe Romain) 
SVN Revision: 2304
 2009-06-16 18:26:36 +00:00
Badlop
3e0827deea Retrieve correct IP from http connection (thanks to Christohpe Romain) 
SVN Revision: 2303
 2009-06-16 18:26:31 +00:00
Badlop
481c7ea4e6 Fix syntax error. (thanks to Jerome Sautret) 
SVN Revision: 2302
 2009-06-16 18:26:27 +00:00
Badlop
646477be08 Removed HTTP bind session count. Removed the 'sponsored bind session' text. (thanks to Michael Remond) 
Details:
Removed the HTTP bind session count because it leaks information on the size of the platform.
Removed the text 'sponsored by Mabber' because it is confusing, as people could think a third-party service using HTTP bind is sponsored by Mabber.

SVN Revision: 2301
 2009-06-16 18:26:23 +00:00
Badlop
3e2c626696 Do not display error message when starting several hosts (EJAB-571) (thanks to Christohpe Romain) 
SVN Revision: 2300
 2009-06-16 18:26:19 +00:00
Badlop
38ce8b494e Provide explanation in error message when module is already started for another vhost 
SVN Revision: 2299
 2009-06-16 18:26:15 +00:00
Badlop
292e2f6b69 Removed small warning 
SVN Revision: 2298
 2009-06-16 18:26:11 +00:00
Badlop
94c3a384b1 Bugfixes (thanks to Alexey Shchepin) 
SVN Revision: 2297
 2009-06-16 18:26:07 +00:00
Badlop
5f07b4bf9b Removed receive_loop (thanks to Alexey Shchepin) 
SVN Revision: 2296
 2009-06-16 18:26:02 +00:00
Badlop
68754c4b5d Remove Erlang module attribute 'vsn' because it does not provide any worth feature, and it difficults hot code update (EJAB-440) 
SVN Revision: 2295
 2009-06-16 18:25:59 +00:00
Badlop
ff4ccc1d85 Bugfix when table does not exist (thanks to Justin Kirby) 
SVN Revision: 2294
 2009-06-16 18:25:54 +00:00
Badlop
d84a2f8215 Migration code for people using previous version of the HTTP binding module (EJAB-390) 
SVN Revision: 2293
 2009-06-16 18:25:51 +00:00
Badlop
86738e965f Do not overwrite the stanza namespace (thanks to Anastasia Gornostaeva) 
SVN Revision: 2292
 2009-06-16 18:25:46 +00:00
Badlop
818f28d85f Support for c2s ACL access, max_stanza and shaper on http_poll connections (EJAB-243, EJAB-415, EJAB-416)(thanks to Michael Remond) 
SVN Revision: 2291
 2009-06-16 18:25:42 +00:00
Badlop
5f7356c16c The Erlang/OTP function httpd_util:to_lower/1 is deprecated, and it is recommended to use string:to_lower/1 instead. 
SVN Revision: 2290
 2009-06-16 18:25:38 +00:00
Badlop
b0b708ddea Use DEBUG instead of INFO_MSG to keep log files small. Fix parse errors for grepping 'stream:error' (thanks to Stefan Strigler) 
SVN Revision: 2289
 2009-06-16 18:25:34 +00:00
Badlop
4adf23b4e9 Forgot keyword 'catch' when doing list_to_float on bosh version attribute for initial request (thanks to Stefan Strigler) 
SVN Revision: 2288
 2009-06-16 18:25:30 +00:00
Badlop
2f29e761c2 Fixes for pausing sessions; did not parse 'pause' attribute to int (thanks to Stefan Strigler) 
SVN Revision: 2287
 2009-06-16 18:25:26 +00:00
Badlop
8aede81188 Support pausing sessions (thanks to Stefan Strigler) (thanks to Stefan Strigler) 
SVN Revision: 2286
 2009-06-16 18:25:22 +00:00
Badlop
c151da684d Comment-header: talk about xmpp over bosh rather than http binding (thanks to Stefan Strigler) 
SVN Revision: 2285
 2009-06-16 18:25:18 +00:00
Badlop
bf4e927142 Removed debugging stuff. Removed error condition (thanks to Stefan Strigler) 
SVN Revision: 2284
 2009-06-16 18:25:14 +00:00
Badlop
7cb0b1a911 Code cleanup. Code reorganization. Store version of bosh session. Use bosh version for error conditions (thanks to Stefan Strigler) 
SVN Revision: 2283
 2009-06-16 18:25:10 +00:00
Badlop
6cbae7025c Store version as float (thanks to Stefan Strigler) 
SVN Revision: 2282
 2009-06-16 18:25:06 +00:00
Badlop
202bece16d Save bosh version with session (thanks to Stefan Strigler) 
SVN Revision: 2281
 2009-06-16 18:25:02 +00:00
Badlop
f07df01185 Code rearranged (thanks to Stefan Strigler) 
SVN Revision: 2280
 2009-06-16 18:24:58 +00:00
Badlop
702978fa4b Make use of macros for namespaces. Some code cleanup. (thanks to Stefan Strigler) 
SVN Revision: 2279
 2009-06-16 18:24:54 +00:00
Badlop
b79473b2f5 Fix for 'terminate' in request, send empty body instead of error (thanks to Stefan Strigler) 
SVN Revision: 2278
 2009-06-16 18:24:50 +00:00
Badlop
80b59441d5 Disabled debugging (thanks to Stefan Strigler) 
SVN Revision: 2277
 2009-06-16 18:24:46 +00:00
Badlop
f422ec457a Some code cleanup (thanks to Stefan Strigler) 
SVN Revision: 2276
 2009-06-16 18:24:42 +00:00
Badlop
5048b6bdaf Bosh compliance: honor xmpp:version (thanks to Stefan Strigler) 
SVN Revision: 2275
 2009-06-16 18:24:38 +00:00
Badlop
01dc4611b9 Restore ejabberd directory structure (src/web) for integration as patch (thanks to Christohpe Romain) 
SVN Revision: 2274
 2009-06-16 18:24:34 +00:00
Badlop
5495516c30 We do not send a 'version' attribute at the stream header for now (thanks to Stefan Strigler) 
SVN Revision: 2273
 2009-06-16 18:24:30 +00:00
Badlop
2f8112b108 Prepare_response: fixed a dbg message. Changed http header (thanks to Stefan Strigler) 
SVN Revision: 2272
 2009-06-16 18:24:26 +00:00
Badlop
229c24e1f2 Implements sockname and peername for compatibility (thanks to Christohpe Romain) 
SVN Revision: 2271
 2009-06-16 18:24:22 +00:00
Badlop
832d59803a Reverted to r76 as 97 is completely broken and should not have been checked in at all (thanks to Stefan Strigler) 
SVN Revision: 2270
 2009-06-16 18:24:18 +00:00
Badlop
197639a34b Minor changes (thanks to Stefan Strigler) 
SVN Revision: 2269
 2009-06-16 18:24:14 +00:00
Badlop
bb229a3a0c Disabled debug (thanks to Stefan Strigler) 
SVN Revision: 2268
 2009-06-16 18:24:09 +00:00
Badlop
eca818be5a Deal with return values from starting/terminating supervisor (thanks to Stefan Strigler) 
SVN Revision: 2267
 2009-06-16 18:24:05 +00:00
Badlop
33896adf9d Disabled debug (thanks to Stefan Strigler) 
SVN Revision: 2266
 2009-06-16 18:24:01 +00:00
Badlop
f5223b1643 Removed my own supervisor (thanks to Stefan Strigler) 
SVN Revision: 2265
 2009-06-16 18:23:57 +00:00
Badlop
ecc2bbd752 Renamed some vars for (thanks to Stefan Strigler) 
SVN Revision: 2264
 2009-06-16 18:23:53 +00:00
Badlop
d019405d51 Start supervisor here (thanks to Stefan Strigler) 
SVN Revision: 2263
 2009-06-16 18:23:49 +00:00
Badlop
7d62dff7e5 Make use of new api for plugable http based services (thanks to Stefan Strigler) 
SVN Revision: 2262
 2009-06-16 18:23:45 +00:00
Badlop
dd8e4c620b Initial commit of HTTP-Bind source code (thanks to Stefan Striegler) 
SVN Revision: 2261
 2009-06-16 18:23:40 +00:00
Badlop
8e8b78a4c3 Add forgotten copyright and license notices. 
SVN Revision: 2196
 2009-06-16 13:53:18 +00:00
Badlop
249ee4b318 New option directory_indices, and improve logging (thanks to Brian Cully)(EJAB-932) 
SVN Revision: 2195
 2009-06-16 13:53:13 +00:00
Badlop
226bcd1360 Fix capitalization of HTTP headers (thanks to Brian Cully)(EJAB-892) 
SVN Revision: 2194
 2009-06-16 13:53:07 +00:00
Badlop
4956ed11f4 Converted to gen_server behaviour (EJAB-561). Use the general reopen_log_hook instead of ejabberdctl command. 
SVN Revision: 2193
 2009-06-16 13:53:02 +00:00
Badlop
b44a3c7650 Fix ip source to comply with new ip storage into ejabberd_http (thanks to Christophe Romain) 
SVN Revision: 2192
 2009-06-16 13:52:57 +00:00
Badlop
fa83147926 Use httpd_util:to_lower when not compiling with Erlang R12 (EJAB-628) 
SVN Revision: 2191
 2009-06-16 13:52:52 +00:00
Badlop
14afea1a20 Added JavaScript content type 
SVN Revision: 2190
 2009-06-16 13:52:47 +00:00
Badlop
4fdc4a2e06 Include Last-Modified HTTP header in responses to allow caching (EJAB-546) in mod_http_fileserver and mod_muc_log_http. 
SVN Revision: 2189
 2009-06-16 13:52:42 +00:00
Badlop
0864e8a24f Fix error creating ETS table if enabled in several vhosts (EJAB-551). Unregister the command when stopping the module. 
SVN Revision: 2188
 2009-06-16 13:52:37 +00:00
Badlop
6af85aea18 Remove Erlang module attribute 'vsn' because it doesn't provide any worth feature, and it difficults hot code update (EJAB-440) 
SVN Revision: 2187
 2009-06-16 13:52:32 +00:00
Badlop
0d4155b902 The Erlang/OTP function httpd_util:to_lower/1 is deprecated, and it's recommended to use string:to_lower/1 instead. 
SVN Revision: 2186
 2009-06-16 13:52:28 +00:00
Badlop
91193bf928 Small change in accesslog file format; fix bug when accesslog conf parameter wasn't present in the conf file (thanks to Jerome Sautret) 
SVN Revision: 2185
 2009-06-16 13:52:17 +00:00
Badlop
b57248e822 Added accesslog parameter to record requests log in a file similar to Apache (thanks to Jerome Sautret) 
SVN Revision: 2184
 2009-06-16 13:52:12 +00:00
Badlop
487b80b9b0 Initial commit of mod_http_fileserver (thanks to Massimiliano Mirra) 
SVN Revision: 2183
 2009-06-16 13:52:07 +00:00
Karim Gemayel
15bc238297 API renaming : jid_to_list -> to_list 
SVN Revision: 2131
 2009-06-01 16:52:14 +00:00
Karim Gemayel
d51d9e9fff API renaming : lnode_as_list -> prep_node_as_list 
SVN Revision: 2126
 2009-06-01 16:40:51 +00:00
Karim Gemayel
7eb395b87d API renaming : ldomain_as_list -> prep_domain_as_list 
SVN Revision: 2124
 2009-06-01 16:38:28 +00:00
Karim Gemayel
526dc54173 API renaming : parse_jid -> parse 
SVN Revision: 2122
 2009-06-01 16:35:55 +00:00
Karim Gemayel
447d3818f5 API renaming : make_jid -> make 
SVN Revision: 2119
 2009-06-01 16:26:00 +00:00
Badlop
0bbbf468f0 Fix crashes when browsing some WebAdmin pages (EJAB-821) 
SVN Revision: 2111
 2009-05-27 17:29:58 +00:00
Badlop
9bcba6c8b8 Update CSS of WebAdmin menu 
SVN Revision: 2110
 2009-05-27 17:29:50 +00:00
Badlop
a1fe76fb5b Support to select what modules to update. Split large function in smaller ones. 
SVN Revision: 2109
 2009-05-27 17:29:43 +00:00
Pablo Polvorin
dc613df3b1 Do not indent the resulting html. Indentation in exmpp is buggy, and there isn't a real adventage on indenting the generated html 
SVN Revision: 2106
 2009-05-27 15:02:44 +00:00
Badlop
55bebb0f62 Implement XEP-158 CAPTCHA Forms, support in mod_muc, sample script (thanks to Evgeniy Khramtsov)(EJAB-895) 
SVN Revision: 2102
 2009-05-26 17:20:09 +00:00
Badlop
2195e433dc * 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
b0f29b20db Merge 1876 from trunk. 
* 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: 1941
 2009-03-03 18:49:02 +00:00
Badlop
79463d7f7d Merge 1873 from trunk. 
* src/web/ejabberd_web_admin.erl: Show big integers with comma
separators for easy reading

SVN Revision: 1939
 2009-03-03 18:29:53 +00:00
Badlop
77ff657351 Merge 1859 from trunk. 
* src/web/ejabberd_web_admin.erl: Calls to the hook
webadmin_menu_node provide the node as first argument, and calls
to webadmin_menu_hostnode provide both the host and the node. Fix
call to make_menu_items, because webadmin_menu_node was called in
cases where webadmin_menu_hostnode should be called. Align to
right some table elements.

SVN Revision: 1938
 2009-03-03 18:24:42 +00:00
Badlop
85412f0a41 Merge from trunk: 1835, 1836, 1842, 1843, 1854, 1858, 1860, 1861, and 1862. 
* doc/Makefile: In Clean do not remove html. In new Distclean,
remove also html.

* doc/Makefile: When cleaning, remove contributed_modules.tex

* src/Makefile.in: Fix arguments to Install program

* doc/guide.tex: Provide only an example of language option
* doc/guide.html: Likewise

* doc/guide.tex: mod_muc can run in several nodes of cluster
* doc/guide.html: Likewise

* doc/api/process-one.css: Add some style to HTML elements

* src/ejabberd_listener.erl: Fix EDoc errors
* src/web/ejabberd_web_admin.erl: Likewise

* src/ejabberd_hooks.erl: Explanation in EDoc of some functions

* doc/guide.tex: Explain that account creation is only supported
by internal and odbc authentication methods
* doc/guide.html: Likewise

* src/Makefile.in: The path to the installed copy of ejabberd
Guide is set in the environment variable
EJABBERD_DOC_PATH (EJAB-837).
* src/web/ejabberd_web_admin.erl: Likewise
* src/ejabberdctl.template: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1937
 2009-03-03 18:11:23 +00:00
Badlop
c73e87e9c8 Merge fix from trunk r1910 
* src/web/ejabberd_http.erl: Added a workaround for inet:peername
returning 'ebadf'

SVN Revision: 1928
 2009-02-27 16:19:19 +00:00
Pablo Polvorin
e989d41d50 "remove_user" hook actualized to expect binary arguments. 
Fix webadmin code that performs addition / removal  of users.

SVN Revision: 1892
 2009-02-20 15:30:16 +00:00
Pablo Polvorin
7c10f3422a src/web/ejabberd_web_admin.erl, src/web/ejabberd_web_admin.hrl: 
Many exmpp related fixes. Fix a bug when displaying users lists, 
if we can't access the 'offline_msg' mnesia table (using mod_offline_odbc).
This fix should be temporal, we should find a better way to manage this
situation.

src/web/ejabberd_http.erl: Language must be in binary() format.

src/translate.erl: Remove a debug call to io:format/2.

src/ejabberd_sm.erl, src/mod_configure.erl, src/mod_disco.erl:
ejabberd_sm:get_user_resources/2 returns resources as binary().

src/ejabberd_sm.erl: Bugfix in get_user_info/3.

SVN Revision: 1886
 2009-02-18 18:03:11 +00:00
Jean-Sébastien Pédron
93b26d947c Add documentation stub for some types. This will be filled later. 
PR:		EJABP-1

SVN Revision: 1865
 2009-02-06 13:34:12 +00:00
Jean-Sébastien Pédron
0cf0992f78 Fix some eDoc @spec directives. 
PR:		EJABP-1

SVN Revision: 1844
 2009-01-22 15:50:43 +00:00
Jean-Sébastien Pédron
842ebfcca0 A lot of bug fixes regarding attribute values type: 
o  Fix some bugs by getting attributes as list() instead of binary().
o  Instead creating #xmlattr directly, use the new ?XMLATTR macro; it'll
take care of the anything-to-binary() conversion.
o  Fix a bug where recipient and sender were used as binary() instead of
list(), which is required by the rest of the S2S code.
o  Fix a bug where binary_to_list/1 was called on a list().

Now concerning JIDs :
o  Now that #jid{} isn't part of the API of Exmppp anymore, replace
remaining direct usages by calls to exmpp_jid.
o  Replace exmpp_jid:make_bare_jid() by exmpp_jid:make_jid().
o  Replace exmpp_jid:*_to_jid/1 by exmpp_jid:parse_jid/1.

PR:		EJABP-1

SVN Revision: 1841
 2009-01-21 13:34:26 +00:00
Jean-Sébastien Pédron
fc77b48344 Merge from trunk (r1804 to r1829). 
The merge party is over, you may now double-check that everything is in
place.

PR:		EJABP-1

SVN Revision: 1830
 2009-01-19 15:27:07 +00:00
Jean-Sébastien Pédron
ff500d8297 Merge from trunk (r1787 to r1804). 
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.

Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1766, r1768, r1781, r1783, r1794, r1797, r1799, r1802.

Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1829
 2009-01-19 14:47:33 +00:00
Jean-Sébastien Pédron
25009ff9f4 Merge from trunk (r1764 to r1787). 
Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1827
 2009-01-19 11:59:40 +00:00
Jean-Sébastien Pédron
bc51bd0dbd Merge from trunk (r1752 to r1764). 
Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1826
 2009-01-19 11:16:44 +00:00
Pablo Polvorin
e0e58711bb XML attributes as binary(). Change Node argument to binary in the following hooks: 
disco_local_items, disco_local_features, disco_local_identity, disco_sm_items and 
disco_sm_identity.

SVN Revision: 1780
 2009-01-08 14:54:00 +00:00
Jean-Sébastien Pédron
9e96043255 Merge from trunk (r1649 to r1692). 
PR:		EJABP-1

SVN Revision: 1695
 2008-12-01 15:53:30 +00:00
Jean-Sébastien Pédron
50b1e4c36f Convert to exmpp. 
The admin web interface is working but HTTP polling seems broken in the
trunk.

PR:		EJABP-1

SVN Revision: 1654
 2008-10-13 15:36:43 +00:00
Jean-Sébastien Pédron
ab2b70f189 Merge from trunk (r1613 to 1649). 
PR:		EJABP-1

SVN Revision: 1650
 2008-10-13 10:11:19 +00:00
Jean-Sébastien Pédron
67a87af459 Merge from trunk (r1563 to r1613). 
PR:		EJABP-1

SVN Revision: 1614
 2008-10-08 12:02:30 +00:00
Jean-Sébastien Pédron
4eaa8e19c9 Merge from trunk (r1457 to r1563). 
SVN Revision: 1564
 2008-09-16 14:39:57 +00:00
Jean-Sébastien Pédron
07b1210b50 Merge revisions from 1444 to revision 1457 from trunk. 
SVN Revision: 1458
 2008-07-17 15:33:50 +00:00
Jean-Sébastien Pédron
574dbbfd08 Merge revisions from 1434 to revision 1444 from trunk. 
SVN Revision: 1445
 2008-07-15 08:45:05 +00:00
Jean-Sébastien Pédron
332fb55e3a MFC: 
Merge revisions from 1362 to revision 1434 from trunk.

SVN Revision: 1435
 2008-07-11 12:48:27 +00:00
Badlop
1e345eb0fc * src/web/ejabberd_web.erl (make_xhtml/2): Allow to include 
elements in the HTTP header

SVN Revision: 1344
 2008-05-31 18:21:43 +00:00
Badlop
98e47e8c73 * src/web/ejabberd_http.erl (parse_auth): Allow password that 
include colon character (EJAB-522)

SVN Revision: 1322
 2008-05-12 17:56:27 +00:00
Badlop
7c64509c46 * src/web/ejabberd_web_admin.erl: Include Last-Modified HTTP 
header in responses to allow caching (EJAB-546)

SVN Revision: 1292
 2008-04-12 08:09:05 +00:00
Christophe Romain
b2bd9759c8 Rewrite io:format calls to loglevel macros (EJAB-555) 
SVN Revision: 1239
 2008-03-21 14:44:16 +00:00
Badlop
9ae1282854 * src/web/ejabberd_web_admin.erl (term_to_string): Show Erlang 
terms in one line in Erlang R12 (EJAB-503)

SVN Revision: 1227
 2008-03-12 22:29:53 +00:00
Alexey Shchepin
5cb8f4826c * src/web/ejabberd_http_poll.erl: Fixed HTTP headers when a 
requested session doesn't exist

SVN Revision: 1223
 2008-03-09 21:28:42 +00:00
Badlop
def8f81f20 * src/web/ejabberd_web_admin.erl: Fixed native support for all the 
ACL types (EJAB-253)

SVN Revision: 1186
 2008-02-12 01:16:11 +00:00
Badlop
2d2fcc8210 * doc/guide.tex: Updated copyright dates to 2008 
* src/*: Likewise

SVN Revision: 1153
 2008-01-15 17:02:57 +00:00
Badlop
1a1f9d1488 * src/web/ejabberd_web_admin.erl: Uniformize the name of 
ejabberd's web admin to: 'Web Admin' (EjAB-472)
* doc/guide.tex: Likewise
* doc/introduction.tex: Likewise

* src/web/ejabberd_web_admin.erl: Uniformize ejabberd name in the
text using the Latex command

SVN Revision: 1137
 2008-01-01 18:20:57 +00:00
Badlop
4562a79b69 * src/web/ejabberd_web_admin.erl: Translate menu items of webadmin 
hooks in each module (EJAB-485)
* src/mod_shared_roster.erl: Likewise

SVN Revision: 1125
 2007-12-26 14:53:37 +00:00
Badlop
264ea1c25f * src/web/ejabberd_web_admin.erl: max_user_sessions access rule 
contains an integer, but webadmin always expects atoms (EJAB-482)

SVN Revision: 1123
 2007-12-26 12:21:52 +00:00
Mickaël Rémond
22f928122f * Applied copyright patch 3. 
SVN Revision: 1113
 2007-12-24 13:57:53 +00:00
Mickaël Rémond
56fe3579bb * Applied copyright update patch 1. 
SVN Revision: 1110
 2007-12-24 11:41:41 +00:00
Badlop
27063837ae * src/web/ejabberd_http.erl: Add 'http_bind' option for easy 
configuration of HTTP-Binding

SVN Revision: 1101
 2007-12-22 14:23:37 +00:00
Badlop
4646c1e015 * src/msgs/pl.msg: Updated (thanks to Andrzej Smyk)(EJAB-463) 
* src/msgs/de.msg: Updated (thanks to Cord Beermann)

* src/msgs/es.msg: Small update (thanks to Badlop)

* src/msgs/cs.msg: Small update (thanks to Lukas Polivka alias
Spike411)

* src/web/ejabberd_web_admin.erl: No need to translate copyright

SVN Revision: 1081
 2007-12-19 18:26:32 +00:00
Badlop
80b7abd8c8 * src/ejabberd_zlib/Makefile.win32: Compile 
all erl files found in the directory, so it isn't needed to provide
an explicit list of target files
* src/eldap/Makefile.win32: Likewise
* src/mod_irc/Makefile.win32: Likewise
* src/mod_muc/Makefile.win32: Likewise
* src/mod_proxy65/Makefile.win32: Likewise
* src/mod_pubsub/Makefile.win32: Likewise
* src/odbc/Makefile.win32: Likewise
* src/stringprep/Makefile.win32: Likewise
* src/tls/Makefile.win32: Likewise
* src/web/Makefile.win32: Likewise

SVN Revision: 1076
 2007-12-17 22:23:56 +00:00
Badlop
60f8b0772e * src/ejabberd_zlib/Makefile.in: Compile all erl files found in 
the directory, so it isn't needed to provide an explicit list of
target files
* src/eldap/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/mod_muc/Makefile.in: Likewise
* src/mod_proxy65/Makefile.in: Likewise
* src/mod_pubsub/Makefile.in: Likewise
* src/odbc/Makefile.in: Likewise
* src/pam/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
* src/web/Makefile.in: Likewise

SVN Revision: 1075
 2007-12-17 18:59:51 +00:00
Mickaël Rémond
4ab25a3c0c * src/web/ejabberd_http.erl: Fixed URL decoding code (EJAB-450) 
SVN Revision: 1057
 2007-12-09 10:45:53 +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
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
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
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
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
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
f6848603f9 * src/web/ejabberd_web_admin.erl: Added a favicon (EJAB-379). 
SVN Revision: 985
 2007-11-26 15:12:34 +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
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
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
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
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
Christophe Romain
d27fbcc27c corrects EJAB-273, remove obsolete OnlineUsers calculation 
SVN Revision: 801
 2007-06-28 08:31:46 +00:00