Christophe Romain
53edf861e0
do not create hometree base when hometree not configured as plugin
...
SVN Revision: 2635
2009-09-25 13:14:59 +00:00
Christophe Romain
24afead423
fix EJAB-1054 (thanks to Evgeniy Khramtsov)
...
SVN Revision: 2633
2009-09-25 12:48:10 +00:00
Christophe Romain
2f5211ab74
improve waiting caps clean (EJAB-1054)
...
SVN Revision: 2629
2009-09-24 19:52:46 +00:00
Christophe Romain
b168cd7cf2
fix EJAB-1044 and EJAB-1055
...
SVN Revision: 2628
2009-09-24 19:47:01 +00:00
Christophe Romain
e5a26b388f
rename pep_sendlast_offline option to ignore_pep_from_offline (EJAB-1047)
...
SVN Revision: 2623
2009-09-23 22:00:53 +00:00
Christophe Romain
479b04a6a3
fix Makefile.win32 for including stun (thanks to neustradamus)
...
SVN Revision: 2620
2009-09-23 21:12:44 +00:00
Badlop
b12b18d59f
Fix wrong XEP number to XEP-0227
...
SVN Revision: 2618
2009-09-23 17:27:09 +00:00
Christophe Romain
b3955fca3a
fix EJAB-1048 and EJAB-819, thanks to badlop
...
SVN Revision: 2616
2009-09-23 16:32:06 +00:00
Mickaël Rémond
4ce2890af0
Replaced Jabber references in config file with XMPP, official name of the protocol
...
SVN Revision: 2612
2009-09-23 12:37:58 +00:00
Christophe Romain
6bdf4aa960
improve configure parsing in iq_pubsub (sync with ejabberd 2.1.0)
...
SVN Revision: 2605
2009-09-20 08:14:24 +00:00
Christophe Romain
36676f0719
fix missing member affiliation on odbc plugin
...
SVN Revision: 2604
2009-09-18 13:44:12 +00:00
Christophe Romain
bb1fca058d
Return terminal binding condition on max stanza size limit (thanks to Aleksey)
...
SVN Revision: 2602
2009-09-18 13:33:12 +00:00
Jérôme Sautret
b4c161e04a
Merge r2592 and r2593 from trunk:
...
Fix pubsub tables constraints in MySQL schema creation script.
Add a "created_at" column to some tables in the MySQL schema to store
a timestamp (thanks to Pedro Melo, EJAB-376).
SVN Revision: 2594
2009-09-10 16:59:58 +00:00
Christophe Romain
376741c9a1
fix delete item to allow owner being able to remove all publisher items, and also fix EJAB-1036
...
SVN Revision: 2591
2009-09-09 21:49:23 +00:00
Badlop
04e86829e3
Change some error messages.
...
SVN Revision: 2588
2009-09-07 14:31:34 +00:00
Christophe Romain
75dbcd5c68
fix minor timestamp shift between item creation and modification
...
SVN Revision: 2586
2009-09-04 23:34:05 +00:00
Pablo Polvorin
283aa52b31
Port #2583 from trunk
...
Use the local (target) domain for firing the s2s_receive_packet hook.
It was using the external server domain (LFrom) instead of the local domain (LTo).
This might have impact on mod_caps in s2s scenarios, needs further attention.
SVN Revision: 2584
2009-09-04 21:33:30 +00:00
Badlop
29b2da42f5
Replace calls from 'regexp' to the OTP R12 new module 're' (EJAB-921)
...
SVN Revision: 2582
2009-09-02 14:26:01 +00:00
Badlop
330a4c9452
Small fix exmpp related code
...
SVN Revision: 2581
2009-09-02 14:25:42 +00:00
Christophe Romain
fa23b83dbb
improve previous patch
...
SVN Revision: 2579
2009-09-01 13:23:19 +00:00
Badlop
81f4644622
Fix missing tag when configuring subscription option (thanks to Clochix)
...
SVN Revision: 2577
2009-09-01 08:19:14 +00:00
Badlop
095cd6ce9b
BOSH module optimization and clean-up (thanks to Aleksey Shchepin and Mickaël Rémond)(EJAB-936)
...
Unfortunately, http-bind doesn't work in this branch,
neither in this commit or before it.
SVN Revision: 2575
2009-08-31 18:40:25 +00:00
Badlop
f5eb9e3c9f
Support zlib compression after STARTTLS (thanks to Aleksey Shchepin)(EJAB-499)
...
Unfortunately, zlib compression doesn't work in this branch,
neither in this commit or before it.
SVN Revision: 2572
2009-08-31 16:30:19 +00:00
Badlop
98f93104a7
Rename erlang log file sasl.log to erlang.log (EJAB-783)
...
SVN Revision: 2568
2009-08-31 11:03:35 +00:00
Christophe Romain
3940a6bab3
secure calls to ets:lookup
...
SVN Revision: 2564
2009-08-28 16:28:22 +00:00
Christophe Romain
de78508f45
fix send last item issue
...
SVN Revision: 2561
2009-08-28 00:09:21 +00:00
Christophe Romain
fab29f4cf0
port all recent fixes from trunk related to odbc subscriptions
...
SVN Revision: 2559
2009-08-27 23:09:20 +00:00
Christophe Romain
adfca08e43
remove INFO_MSG call inside sql_query_internal
...
SVN Revision: 2557
2009-08-27 22:30:57 +00:00
Christophe Romain
35e8b95928
added pubsub odbc tables creation
...
SVN Revision: 2550
2009-08-27 09:49:37 +00:00
Christophe Romain
f5091aa1ae
pubsub now is sync with last trunk
...
SVN Revision: 2546
2009-08-27 08:48:21 +00:00
Christophe Romain
bb08207569
fix node_public portage
...
SVN Revision: 2545
2009-08-27 08:34:16 +00:00
Christophe Romain
71e0d7d8e2
port commit from r2527 to odbc plugin
...
SVN Revision: 2544
2009-08-27 08:26:22 +00:00
Christophe Romain
3b27670d4d
update win32 makefile
...
SVN Revision: 2542
2009-08-27 07:55:45 +00:00
Pablo Polvorin
944dd1cc7f
Port pubsub odbc backend to exmpp.
...
Warning: A work in progress, isn't working yet!
SVN Revision: 2541
2009-08-26 20:27:57 +00:00
Evgeniy Khramtsov
ba3a45452e
check if a room is not persistent before starting a new one with the same name (EJAB-1026)
...
SVN Revision: 2540
2009-08-26 04:18:42 +00:00
Pablo Polvorin
f7c5a4a15b
backport trunk commit r2530
...
SVN Revision: 2538
2009-08-25 20:33:01 +00:00
Pablo Polvorin
4d5bfe2ee8
Fix pubsub_publish_item_ hook call parameter and jid conversion on node_hometree.
...
published messages are delivered to subscribers (flat nodes).
SVN Revision: 2537
2009-08-25 20:03:28 +00:00
Pablo Polvorin
a1a6469ed0
Updated to trunk r2532, fix subscription managment (by owner)
...
SVN Revision: 2536
2009-08-25 19:54:44 +00:00
Pablo Polvorin
fcf66c2e75
Fix affiliation managment
...
Node owner can add/remove affiliations
SVN Revision: 2535
2009-08-25 17:42:25 +00:00
Pablo Polvorin
b4f0bb65c6
Fix disco#items on pubsub nodes
...
SVN Revision: 2534
2009-08-25 17:23:43 +00:00
Pablo Polvorin
938a4007b3
Initial port of pubsub changes(up to r2444) to exmpp branch.
...
pubsub odbc isn't ported yet.
Not tested (only basic node creation and configuration), should still have losts of bugs to discover.
SVN Revision: 2533
2009-08-25 17:14:30 +00:00
Badlop
6470e6cc25
Write PID file, path is configurable in ejabberdctl.cfg (EJAB-1023)
...
SVN Revision: 2527
2009-08-24 21:21:39 +00:00
Badlop
19355e947e
Prepare ejabberd.init when installing ejabberd.
...
SVN Revision: 2524
2009-08-24 19:59:30 +00:00
Badlop
d9a8c89b5a
Added preliminary template file for ejabberd.init (thanks to Christophe Romain)
...
SVN Revision: 2523
2009-08-24 19:59:17 +00:00
Evgeniy Khramtsov
6688b4ea78
do not include MAPPED-ADDRESS in new style responses since it is not required by the RFC
...
SVN Revision: 2515
2009-08-21 06:07:55 +00:00
Badlop
ec26a28cd2
Merge 2427 from trunk: return timeout in requests if DB connection can't be established
...
SVN Revision: 2511
2009-08-20 17:37:37 +00:00
Badlop
05755b9b09
Merge some old English fixes from trunk SVN.
...
SVN Revision: 2505
2009-08-19 17:59:49 +00:00
Badlop
007cafa7cd
Fix EDoc errors.
...
SVN Revision: 2495
2009-08-17 17:17:34 +00:00
Badlop
a9ce2fc38a
Display room service messages in distintive blue colour.
...
SVN Revision: 2492
2009-08-15 22:03:14 +00:00
Badlop
0175932d86
Update Ingoing s2s connections inner state to hold domain name (thanks to Juan Pablo Carlino)(EJAB-972)
...
SVN Revision: 2490
2009-08-15 21:39:41 +00:00
Badlop
26cdea53c7
Don't allow room config to enable password protection with empty password (EJAB-1011)
...
SVN Revision: 2488
2009-08-15 20:11:24 +00:00
Badlop
e585b07d76
If room config violates service policy, return not-acceptable instead of bad-request.
...
SVN Revision: 2487
2009-08-15 20:11:10 +00:00
Badlop
6eb5b544b4
Remove workarounds that supported R11 or older (EJAB-446)(EJAB-628)(EJAB-997)
...
SVN Revision: 2486
2009-08-15 20:10:49 +00:00
Evgeniy Khramtsov
9c0495b563
removed unnecessary gen_server call
...
SVN Revision: 2477
2009-08-13 10:02:04 +00:00
Badlop
14464ab6cc
Add support in WebAdmin for the new listener network protocol
...
SVN Revision: 2464
2009-08-11 18:24:12 +00:00
Badlop
a4b2d032f9
Add stun directory to compilation process
...
SVN Revision: 2463
2009-08-11 18:23:54 +00:00
Badlop
3078c28d1a
Document STUN server (thanks to Evgeniy Khramtsov), and minor doc enhancements.
...
* Add stun listener to example config file, disabled.
* Improve enumeration of listeners options
SVN Revision: 2460
2009-08-11 13:22:39 +00:00
Evgeniy Khramtsov
cf90c8176e
updated top supervisor for STUN support
...
SVN Revision: 2459
2009-08-11 13:17:46 +00:00
Evgeniy Khramtsov
0a8bcf6530
restore missing stun directory
...
SVN Revision: 2458
2009-08-11 12:54:40 +00:00
Evgeniy Khramtsov
bf0dbeb8b3
STUN support backport
...
SVN Revision: 2457
2009-08-11 12:53:46 +00:00
Badlop
2e8fe6a1ab
Add ejabberd command to get the current loglevel (EJAB-1004)
...
SVN Revision: 2449
2009-08-07 14:56:12 +00:00
Badlop
936b2d4188
Merge 2426 from trunk: add get/0 API function that returns current log level (EJAB-1004).
...
SVN Revision: 2436
2009-08-06 22:01:01 +00:00
Badlop
9a204593e1
Merge 2425 from trunk: fix keepalive query, broken by r2092.
...
SVN Revision: 2435
2009-08-06 21:57:53 +00:00
Badlop
562e63a3b0
Fix argument passing
...
SVN Revision: 2433
2009-08-06 21:15:15 +00:00
Badlop
4f6b67b190
Move functions from roster_versioning to mod_roster (EJAB-964)
...
SVN Revision: 2431
2009-08-06 21:07:18 +00:00
Pablo Polvorin
1b85310f1a
Support for roster versioning (EJAB-964)
...
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 15:45:13 +00:00
Badlop
6aa3706bec
Support XEP-0227 Portable Import/Export (EJAB-993)
...
SVN Revision: 2421
2009-08-05 18:23:54 +00:00
Pablo Polvorin
92ad67a814
Fix problems when deleting a roster item.
...
The deleted item was left on the user roster, and unsubscribe presence stanza wasn't sent to the unsubscribed user.
SVN Revision: 2420
2009-08-05 17:39:47 +00:00
Badlop
14399e3d57
Support XEP-0199 Ping (thanks to Brian Cully and Evgeniy Khramtsov)(EJAB-974)
...
SVN Revision: 2419
2009-08-03 19:33:42 +00:00
Badlop
a321ab3653
Document the new option s2s_dns_options, expressed in seconds (EJAB-994)
...
SVN Revision: 2418
2009-08-03 15:04:52 +00:00
Evgeniy Khramtsov
ce3fa18fb6
fixes incorrect substitution of an LDAP pattern
...
SVN Revision: 2415
2009-07-31 06:43:17 +00:00
Badlop
f5868a0952
Delete expat_erl, stringprep, xml and xml_stream; replaced by exmpp (EJAB-991)
...
SVN Revision: 2409
2009-07-30 17:57:56 +00:00
Evgeniy Khramtsov
35c1c3774c
do not crash on unmatched request
...
SVN Revision: 2407
2009-07-30 13:10:01 +00:00
Geoff Cant
628b03f3c0
EJAB-994: Implements DNS timeouts and retries.
...
SVN Revision: 2405
2009-07-30 12:35:18 +00:00
Evgeniy Khramtsov
c6f3fbb82c
treap.erl backport
...
SVN Revision: 2400
2009-07-29 03:43:58 +00:00
Geoff Cant
504cc7b7dd
EJAB-940: Implements reliable ODBC transaction nesting.
...
SVN Revision: 2396
2009-07-28 13:43:00 +00:00
Badlop
e6205e8f26
Fix error when nick registration stanza doesn't contain Value.
...
SVN Revision: 2395
2009-07-27 09:37:24 +00:00
Badlop
620a50223c
New command to dump a table to text file.
...
SVN Revision: 2391
2009-07-23 15:23:26 +00:00
Badlop
646adbf186
Add support to delete content and delete table.
...
SVN Revision: 2390
2009-07-23 15:23:21 +00:00
Badlop
73f2fc76d9
Log an error if HTTP request does not include Host header (EJAB-966)
...
SVN Revision: 2387
2009-07-23 14:51:16 +00:00
Evgeniy Khramtsov
553969f0fd
delete/2 now does not crash when there is nothing to delete. fold/1 added
...
SVN Revision: 2385
2009-07-22 06:52:47 +00:00
Mickaël Rémond
ee142c5fe1
Fix typo from EJAB-988
...
SVN Revision: 2381
2009-07-21 19:18:22 +00:00
Badlop
97dfcb9fb0
HTML room logs: fix formatting of spaces; log config when disabling logging; display occupants (EJAB-986)
...
SVN Revision: 2379
2009-07-21 18:35:20 +00:00
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
5e05ad03bb
Support XEP-0157: Contact Addresses for XMPP Services (EJAB-235)
...
SVN Revision: 2369
2009-07-17 20:47:40 +00:00
Badlop
8d988d1bd2
Store account number in internal auth of (EJAB-981)(thanks to Juan Pablo Carlino)
...
SVN Revision: 2366
2009-07-17 19:06:42 +00:00
Badlop
f3db058fef
If a command is already defined: log as Debug, not as Warning.
...
SVN Revision: 2363
2009-07-16 20:18:36 +00:00
Badlop
b49a15efeb
If directory /sbin is created, set permissions 755, not 750.
...
SVN Revision: 2359
2009-07-07 08:27:58 +00:00
Badlop
be5b35e999
Temporary Debug and Ctl nodes must get nodename similar to destination.
...
SVN Revision: 2357
2009-07-06 14:11:35 +00:00
Badlop
30697ca0a1
Add -hidden flag when calling Debug or Ctl
...
SVN Revision: 2356
2009-07-06 14:11:31 +00:00
Badlop
0e19ca68b4
Support XEP-0085 Chat State Notifications (EJAB-961)
...
SVN Revision: 2351
2009-06-30 19:33:09 +00:00
Badlop
f82131af15
Include original timestamp on delayed presences (thanks to Mickael Remond)(EJAB-234)
...
SVN Revision: 2349
2009-06-30 17:51:37 +00:00
Badlop
16ca8d178d
Add XEP82 Date Time, update XEP202 Entity Time and XEP203 Delayed Delivery (EJAB-234)
...
SVN Revision: 2347
2009-06-30 16:55:26 +00:00
Badlop
cdac156f2e
Add announcement of offline feature to service discovery (EJAB-234)
...
SVN Revision: 2346
2009-06-30 16:54:46 +00:00
Badlop
ba335346f2
Don't use lists:keyfind/3 bcause it was introduced only in recent R13A.
...
SVN Revision: 2342
2009-06-25 18:05:34 +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
bfbc69e8f9
Update version number to 3.0.0-alpha
...
SVN Revision: 2326
2009-06-17 09:06:52 +00:00
Badlop
13c76c12f8
Workaround to compile with exmpp
...
SVN Revision: 2324
2009-06-16 18:28:06 +00:00
Badlop
08ebf50480
Add permanent section about mod_http_fileserver to the Guide. Example config.
...
SVN Revision: 2323
2009-06-16 18:28:01 +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
77a62670d3
Add permanent section about mod_http_fileserver to the Guide. Example config.
...
SVN Revision: 2197
2009-06-16 13:53:25 +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
Badlop
818a70bdd7
Do not include mod_irc, it can be found in ejabberd-modules SVN. Iconv not required. (EJAB-954)
...
SVN Revision: 2167
2009-06-16 11:27:33 +00:00
Mickaël Rémond
940f5be35e
Fix syntax error in config file
...
SVN Revision: 2166
2009-06-16 00:49:09 +00:00
Badlop
88fd7b226a
Add option to restrict max offline messages by Access and ACL (EJAB-951)
...
New option for mod_offline: access_max_user_messages.
The old option user_max_messages is no longer supported.
SVN Revision: 2163
2009-06-15 17:44:04 +00:00
Badlop
2f6cea2be3
Fix warning about a case already covered.
...
SVN Revision: 2161
2009-06-15 17:27:11 +00:00
Badlop
b4a1b4c8fb
Replace TYPE/1 with is_TYPE/1 (EJAB-922)
...
SVN Revision: 2160
2009-06-15 17:27:06 +00:00
Badlop
2f3963417f
Prevent process crash if the IP and port of a connection is unknown.
...
SVN Revision: 2156
2009-06-11 18:57:03 +00:00
Badlop
8de03275c3
When client is closed, include the Reason in the stream trailer stanza.
...
SVN Revision: 2154
2009-06-09 12:10:24 +00:00
Badlop
60f52b2cd8
Add forgotten copyright and license notices. Fix blackspaces.
...
SVN Revision: 2152
2009-06-09 10:56:49 +00:00
Badlop
dd101c99e5
Malformed CAPTCHA response may crash a room. This is now fixed. (thanks to Evgeniy Khramtsov)
...
SVN Revision: 2150
2009-06-09 09:39:07 +00:00
Badlop
a45e6da3d0
Remove support of deprecated Disco Publish XEP-0030 (EJAB-904)
...
SVN Revision: 2141
2009-06-02 18:09:01 +00:00
Badlop
2b6f45e4c1
Update some calls from jlib:make_jid to exmpp_jid:make
...
SVN Revision: 2139
2009-06-01 23:44:55 +00:00
Badlop
332de67fe2
Fix some calls to exmpp
...
SVN Revision: 2138
2009-06-01 21:04:16 +00:00
Badlop
ff3fd02115
Fix Access check: the rule can be defined in a vhost or global.
...
SVN Revision: 2137
2009-06-01 21:04:11 +00:00
Karim Gemayel
437c9d07f5
API renaming : bare_jid_to_binary -> bare_to_binary
...
SVN Revision: 2135
2009-06-01 17:00:44 +00:00
Karim Gemayel
9abe47f350
API renaming : jid_to_binary -> to_binary
...
SVN Revision: 2134
2009-06-01 16:59:08 +00:00
Karim Gemayel
7a884ced32
API renaming : bare_jid_to_list -> bare_to_list
...
SVN Revision: 2133
2009-06-01 16:54:33 +00:00
Karim Gemayel
0ace8bda8c
API renaming : prepd_jid_to_list -> prep_to_list
...
SVN Revision: 2132
2009-06-01 16:53:48 +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
1b94c7a8b3
API renaming : compare_bare_jids -> bare_compare
...
SVN Revision: 2130
2009-06-01 16:50:36 +00:00
Karim Gemayel
c31f99937f
API renaming : compare_jids -> compare
...
SVN Revision: 2129
2009-06-01 16:49:00 +00:00
Karim Gemayel
4258b99b2b
API renaming : lresource_as_list -> prep_resource_as_list
...
SVN Revision: 2128
2009-06-01 16:43:15 +00:00
Karim Gemayel
29c0e17ca2
API renaming : lresource -> prep_resource
...
SVN Revision: 2127
2009-06-01 16:42:07 +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
d5f2c41f26
API renaming : lnode -> prep_node
...
SVN Revision: 2125
2009-06-01 16:39:36 +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
19d7d79229
API renaming : ldomain -> prep_domain
...
SVN Revision: 2123
2009-06-01 16:37:15 +00:00
Karim Gemayel
526dc54173
API renaming : parse_jid -> parse
...
SVN Revision: 2122
2009-06-01 16:35:55 +00:00
Karim Gemayel
a136192db2
API renaming : bare_jid_to_jid -> full
...
SVN Revision: 2121
2009-06-01 16:34:38 +00:00
Karim Gemayel
5dbc4f9954
API renaming : jid_to_bare_jid > bare
...
SVN Revision: 2120
2009-06-01 16:30:15 +00:00
Karim Gemayel
447d3818f5
API renaming : make_jid -> make
...
SVN Revision: 2119
2009-06-01 16:26:00 +00:00
Christophe Romain
7c45f8f053
fix nodetree virtual to allow node subscription
...
SVN Revision: 2117
2009-05-29 00:44:07 +00:00
Christophe Romain
497d4d26bb
make flat the default node plugin
...
SVN Revision: 2116
2009-05-29 00:27:26 +00:00
Christophe Romain
db6a8c2e05
fix ets table name change
...
SVN Revision: 2115
2009-05-29 00:13:21 +00:00
Christophe Romain
a16230c9ca
pubsub: added configuration option in guide.tex, added last item cache, use default node type if given type is not configured, make node_flat the default node plugin. caps: improve cache handling
...
SVN Revision: 2114
2009-05-28 23:21:50 +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
Christophe Romain
45a8a0fb53
make get_items able to sort items in publish order (EJAB-824)
...
SVN Revision: 2105
2009-05-26 22:50:11 +00:00
Christophe Romain
aa210166c4
improve get_entity_* to work regardless of nodetree (EJAB-937)
...
SVN Revision: 2104
2009-05-26 21:50:13 +00:00
Badlop
43a3fef7bb
Document how to setup CAPTCHA. Install example captcha.sh (EJAB-895)
...
SVN Revision: 2103
2009-05-26 17:20:50 +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
18ae44f930
Support LDAPS with TLS (EJAB-109)(thanks to Thomas Baden, Andy Harb, Sergei Golovan, Anton Podavalov)
...
SVN Revision: 2099
2009-05-25 17:16:54 +00:00
Badlop
dc3899dfd9
Decrease proxy65 buffer sizes to 8192 bytes.
...
The original size of 65535 confused clients with tight
shapers (thanks to Evgeniy Khramtsov)
SVN Revision: 2097
2009-05-25 11:19:28 +00:00
Mickaël Rémond
b6b4b0cdf9
* trunk/src/odbc/ejabberd_odbc.erl: Fix typo (EJABS-859) (EJAB-940) (CR-EJAB-10)
...
* branches/road-to-exmpp/src/odbc/ejabberd_odbc.erl: Likewise.
SVN Revision: 2095
2009-05-21 16:43:33 +00:00
Mickaël Rémond
8be73967fd
* src/odbc/ejabberd_odbc.erl: Support for nested transactions (EJABS-859) (EJAB-940) (CR-EJAB-10)
...
SVN Revision: 2094
2009-05-21 16:28:49 +00:00
Christophe Romain
2e26b6bf8b
PubSub: improve get_entity_* API
...
SVN Revision: 2091
2009-05-19 22:29:28 +00:00
Badlop
b473862da6
Added API function to get current S2S connections with information
...
get_info_s2s_connections(Type) returns a list of incoming (or outgoing)
S2S connections with information for each one including IP address,
port number, TLS options... (thanks to Juan Pablo Carlino)
SVN Revision: 2089
2009-05-19 09:39:13 +00:00
Badlop
0a9581a375
LDAP bind attempts: log warnings and increase timeout after reject.
...
Merged from trunk SVN r2086:
Log warnings on unsuccessful LDAP bind attempts.
Increase timeout before the next LDAP bind attempt up to
five seconds if the last bind attempt was rejected by the
LDAP server ("soft" error) (thanks to Konstantin Khomoutov)
SVN Revision: 2087
2009-05-18 11:41:53 +00:00
Badlop
23509c1688
New command to convert mnesia nodename, copied from OTP and Debian
...
SVN Revision: 2084
2009-05-15 22:56:55 +00:00
Badlop
a63f548528
Allow to define additional Erlang options in ejabberdctl.cfg (thanks to Sergei Golovan)
...
SVN Revision: 2083
2009-05-15 22:56:13 +00:00
Badlop
ee8ed2828a
The --node argument overwrites the value of ejabberdctl.cfg
...
SVN Revision: 2082
2009-05-15 22:55:29 +00:00
Badlop
35daf5df78
No longer edit ChangeLog, will be auto generated for ejabberd releases.
...
Added new call 'make changelog' which generates a ChangeLog file by
prepending to the old file obtained from SVN the new lines obtained
from SVN Log and formatted with svn2cl.
ChangeLog will be generated and included in ejabberd releases.
SVN Revision: 2076
2009-05-14 21:12:12 +00:00
Mickaël Rémond
3ca2d4dab3
* src/ejabberd_debug.erl: Handled fprof based profiling (EJABS-872).
...
* src/ejabberd_app.erl: Likewise.
SVN Revision: 2075
2009-05-13 12:36:37 +00:00
Christophe Romain
c12b1870b7
Fix bad transaction returncode in unsubscribe presence handler
...
SVN Revision: 2074
2009-05-12 21:00:05 +00:00
Christophe Romain
fd36726357
Prevent race condition when calling get_caps while note_caps has not been handled yet (EJAB-934)
...
SVN Revision: 2072
2009-05-11 17:27:55 +00:00
Christophe Romain
8dc1bb0659
handle Example 90 of XEP-0060 (EJAB-909), and make use of nodeAttr
...
SVN Revision: 2069
2009-05-08 01:28:17 +00:00
Christophe Romain
38413dc236
Allow to get subscriptions on a given node (EJAB-712), and presence based fixes
...
SVN Revision: 2067
2009-05-08 00:02:08 +00:00
Badlop
ef94ad36cd
Merge 2063 from trunk.
...
* src/ejabberd_app.erl: Better support for profiling.
* src/ejabberd.erl: Likewise
* src/ejabberd_ctl.erl: Likewise
* src/ejabberd_debug.erl: Likewise
SVN Revision: 2064
2009-05-07 22:56:23 +00:00
Christophe Romain
e40e4298ca
several pubsub fixes and improvements. also fixes EJAB-913 and EJAB-871
...
SVN Revision: 2061
2009-05-07 00:54:44 +00:00
Badlop
1d3947c0da
Replace TYPE/1 with is_TYPE/1 (EJAB-922)
...
SVN Revision: 2057
2009-05-06 16:54:43 +00:00
Badlop
69349925a3
* src/Makefile.in: Prevent Erlang R13B compilation warning:
...
behaviour X undefined (EJAB-920)
SVN Revision: 2056
2009-05-06 15:15:09 +00:00
Badlop
921c7ede0d
* src/ejabberd_loglevel.erl: Use dynamic_compile instead of
...
ram_file_io_server. Support definition of loglevels with integer
or atom. (thanks to Geoff Cant)(EJAB-919)
* src/dynamic_compile.erl: Added erlang module that converts
string to binary loadable code by Mats Cronqvist, Chris Newcombe,
and Jacob Vorreuter.
* src/ram_file_io_server.erl: Remove file not longer useful.
* src/ejabberd.app: Likewise
SVN Revision: 2054
2009-05-06 14:51:51 +00:00
Badlop
e202ec009e
* src/mod_muc/mod_muc_room.erl: Fix badarg return (EJAB-899)
...
SVN Revision: 2053
2009-05-03 11:26:18 +00:00
Christophe Romain
ced30acb20
backport pubsub/pep/caps optimizations from trunk
...
SVN Revision: 2052
2009-04-30 23:17:38 +00:00
Badlop
3debaf99d8
* src/ejabberd_hooks.erl: Support distributed hooks (EJAB-829)
...
SVN Revision: 2047
2009-04-28 14:57:16 +00:00
Badlop
2908e5da19
Merge 1969 and 1970 from trunk.
...
* src/ejabberd_hooks.erl: anonymous functions support.
SVN Revision: 2046
2009-04-28 14:46:12 +00:00
Badlop
5afe7cfafb
* src/translate.erl: Support additional files (EJAB-925)
...
* contrib/extract_translations/extract_translations.erl: Likewise
* contrib/extract_translations/prepare-translation.sh: Likewise
SVN Revision: 2044
2009-04-27 20:55:35 +00:00
Badlop
d7829a76ce
* src/win32_dns.erl: Fix problem parsing some win32 dns (EJAB-927)
...
SVN Revision: 2043
2009-04-27 20:36:19 +00:00
Badlop
ec779c001c
* src/cyrsasl_digest.erl: Fix auth verification (EJAB-863)
...
SVN Revision: 2042
2009-04-27 20:24:21 +00:00
Badlop
028509c3a9
* src/jlib.erl: Fix recursive call to speedup base64
...
decoding (thanks to Jeffrey Rogiers)(EJAB-333)
SVN Revision: 2041
2009-04-27 19:17:17 +00:00
Christophe Romain
fd5e312ed9
minor cosmetic fix
...
SVN Revision: 2040
2009-04-24 21:34:59 +00:00
Christophe Romain
6710d66a58
fix minor pubsub init glitch, and allow ejabberd_odbc to execute bloc of queries without transaction
...
SVN Revision: 2039
2009-04-24 10:32:41 +00:00
Christophe Romain
1d44abfc8a
improve send last published items spawning
...
SVN Revision: 2037
2009-04-22 23:01:51 +00:00
Badlop
0141779b9c
* src/ejabberd.cfg.example: Fix English typos. Fix line length:
...
max 80 characters per line. Remove trailing blankspaces. Added
markers for Vim fold, you may want to add to $HOME/.vimrc this
line: set modeline
* src/ejabberdctl.cfg.example: Likewise
SVN Revision: 2035
2009-04-22 13:45:57 +00:00
Badlop
92b1e9d9ac
* src/mod_muc/mod_muc.erl: Limit number of characters in Room ID,
...
Name and Description (EJAB-899)
* src/mod_muc/mod_muc_room.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 2034
2009-04-22 12:05:10 +00:00
Badlop
43b59911e2
* src/cyrsasl.erl: Change API of check_password: pass a function
...
to generate the digest (thanks to Graham Whitted)(EJAB-863)
* src/cyrsasl_anonymous.erl: Likewise
* src/cyrsasl_digest.erl: Likewise
* src/cyrsasl_plain.erl: Likewise
* src/ejabberd_auth.erl: Likewise
* 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
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 2033
2009-04-22 11:44:03 +00:00
Badlop
240e37c387
* src/ejabberd_c2s.erl: Fix for SASL Anonymous connections not
...
stored or purged (thanks to Andy Skelton)(EJAB-912)
SVN Revision: 2032
2009-04-22 11:02:03 +00:00
Badlop
39f71ab2ab
* src/mod_shared_roster.erl: Support in API to add 'all' as member
...
of a group (thanks to Martin Langhoff)(EJAB-916)
SVN Revision: 2031
2009-04-22 10:40:11 +00:00
Badlop
fd967d6976
* 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
b451f07801
* 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
5ca560d0bd
* src/mod_caps.erl: Fix unbound variable
...
SVN Revision: 2022
2009-04-17 13:40:57 +00:00
Badlop
8782597c1a
* 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
ab4750ec1e
after check, last commit was useless
...
SVN Revision: 2019
2009-04-14 12:46:55 +00:00
Christophe Romain
b519fdd3cb
back to original caps patch which may be safer
...
SVN Revision: 2018
2009-04-14 10:13:05 +00:00
Christophe Romain
08cbaf8ccf
Better handling of presence hook and caps clean
...
SVN Revision: 2015
2009-04-10 13:21:37 +00:00
Badlop
6b2a838e24
* src/msgs/pl.po: Fix some translations (thanks to Andrzej Smyk)
...
SVN Revision: 2011
2009-04-09 11:18:06 +00:00
Badlop
854b448536
* 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
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
d13be09524
* src/mod_pubsub/mod_pubsub.erl: Quickfix compilation errors.
...
SVN Revision: 2008
2009-04-08 18:58:11 +00:00
Badlop
e34d6e3678
* src/mod_irc/mod_irc_connection.erl: Fix compilation warnings.
...
SVN Revision: 2006
2009-04-08 18:52:52 +00:00
Badlop
61691ac47d
Merge 1998 from trunk.
...
* 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: 1999
2009-03-24 18:02:13 +00:00
Christophe Romain
3e756f5d1c
implement roster acces model (EJAB-780)
...
SVN Revision: 1997
2009-03-20 00:08:38 +00:00
Christophe Romain
026c4a2711
Allow more environment variable overrides in ejabberdctl (EJAB-891)
...
SVN Revision: 1996
2009-03-19 21:30:10 +00:00
Badlop
cd3556f195
Fix mistake when calling win32_dns.
...
SVN Revision: 1990
2009-03-11 18:36:27 +00:00
Badlop
b245d68568
* 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
2c4effe6ce
typo fix on roster access_model
...
SVN Revision: 1985
2009-03-10 12:09:31 +00:00
Christophe Romain
5ed381fc58
Fix PEP with other domains and s2s (EJAB-825)
...
SVN Revision: 1982
2009-03-10 11:13:46 +00:00
Badlop
4c08e65fab
* 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
4dde341c9d
Merge 1925 from trunk.
...
* src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not
defined, the module takes an IP address of a local
hostname (thanks to Evgeniy Khramtsov)
SVN Revision: 1978
2009-03-09 14:44:46 +00:00
Badlop
ed3cae6f11
* 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
56c33e994d
* 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
Badlop
d6820f2c2d
* src/mod_privacy.erl: Temporary workaround to inconsistency
...
* src/mod_privacy_odbc.erl: Likewise
SVN Revision: 1975
2009-03-07 08:53:34 +00:00
Badlop
cf4b7b36ee
Merge 1856 from trunk.
...
* src/eldap/eldap.erl: moves waiting for response queries to
pending queue on an LDAP connection failure (thanks to Evgeniy
Khramtsov)
SVN Revision: 1974
2009-03-06 11:50:23 +00:00
Badlop
d23ebd354b
Merge 1855 from trunk.
...
* src/eldap/eldap.erl: implemented queue for pending
queries (thanks to Evgeniy Khramtsov)
SVN Revision: 1973
2009-03-06 11:42:56 +00:00
Badlop
66c60c4e6d
Merge 1851 from trunk.
...
* src/eldap/eldap.erl: Close a connection on tcp_error (thanks to
Evgeniy Khramtsov)
SVN Revision: 1972
2009-03-06 11:39:12 +00:00
Badlop
19b803bb03
* 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
7982492f50
* 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
Badlop
7af7afc30e
* src/mod_caps.erl: Fix two small compilation errors
...
SVN Revision: 1965
2009-03-04 09:55:20 +00:00
Christophe Romain
ab2dc5877f
Allow node creation without configure item
...
SVN Revision: 1964
2009-03-04 01:14:13 +00:00
Christophe Romain
592c98fd7a
update pubsub version
...
SVN Revision: 1961
2009-03-04 01:04:51 +00:00
Christophe Romain
facf17e689
Add roster subscriptions handling and make PEP events sent to all resources
...
SVN Revision: 1958
2009-03-03 23:26:07 +00:00
Badlop
1db9642e4c
Merge 1916 from trunk.
...
* src/ejabberd_listener.erl: Fix report message of 'undef' error
SVN Revision: 1955
2009-03-03 19:48:20 +00:00
Badlop
4df4527e77
Merge 1907 from trunk.
...
* src/ejabberd_listener.erl: Fix a minor compilation warning and
add EDoc comment
SVN Revision: 1954
2009-03-03 19:46:08 +00:00
Badlop
dbf0bb209d
Merge 1891 from trunk.
...
* src/ejabberd_listener.erl: When stopping a listener, don't stop
the listener supervisor (EJAB-874)
SVN Revision: 1953
2009-03-03 19:43:55 +00:00
Badlop
9a7c6b8be1
Merge 1884 from trunk.
...
* src/ejabberd_listener.erl: More error detections
SVN Revision: 1952
2009-03-03 19:40:55 +00:00
Badlop
36fc43c364
Merge 1883 from trunk.
...
* src/ejabberd_listener.erl: More error detections
SVN Revision: 1951
2009-03-03 19:39:36 +00:00
Badlop
f80758f0de
Merge 1882 from trunk.
...
* src/ejabberd_config.erl: Check certfiles are readable on server
start and listener start (EJAB-753)
* src/ejabberd_listener.erl: Likewise
SVN Revision: 1950
2009-03-03 19:38:13 +00:00
Badlop
25ef60a2c1
Merge 1875 from trunk.
...
* 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: 1949
2009-03-03 19:35:32 +00:00
Badlop
5bfdb71b4c
Merge 1881 from trunk.
...
* 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: 1948
2009-03-03 19:32:48 +00:00
Badlop
890b1c4f60
Merge 1834 from trunk.
...
* 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: 1947
2009-03-03 19:26:24 +00:00
Badlop
4046ecc99e
Merge 1880 from trunk.
...
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
must provide the password, like other participants (EJAB-867)
SVN Revision: 1946
2009-03-03 19:07:24 +00:00
Badlop
fe297e1dea
Merge 1879 from trunk.
...
* src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
linkifying only a few known protocols (EJAB-850)
SVN Revision: 1945
2009-03-03 19:03:56 +00:00
Badlop
f0c0b2230a
Merge 1878 from trunk.
...
* src/mod_muc/mod_muc.erl: Export function to create MUC
room (thanks to Eric Cestari) (EJAB-729)
SVN Revision: 1944
2009-03-03 19:01:24 +00:00
Badlop
23ec55975e
Merge 1877 from trunk.
...
* 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: 1943
2009-03-03 18:57:47 +00:00
Badlop
54da31e805
Merge 1874 from trunk.
...
* 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: 1942
2009-03-03 18:53:28 +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
c13ed8c625
Merge 1872 from trunk.
...
* 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: 1940
2009-03-03 18:45:26 +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
Pablo Polvorin
54a6992ae0
Serialize s2s stanzas to iolist() rather than list()
...
SVN Revision: 1936
2009-03-02 15:48:01 +00:00
Pablo Polvorin
2c35514537
Correct include declaration (thanks to badlop). Bug was introduced in r1863
...
SVN Revision: 1935
2009-03-02 13:27:35 +00:00
Pablo Polvorin
7fea7b30b2
Elements and namespace for (XEP-0039) aren't know by exmpp (" http://jabber.org/protocol/stats " is represented as a list())
...
SVN Revision: 1934
2009-03-01 20:48:43 +00:00
Pablo Polvorin
f0d55c9a3f
Fix bug when clients connect using legacy ssl
...
(ejabberd_receiver:process_data/2 was called before initializing the xmlstream).
SVN Revision: 1933
2009-03-01 20:18:42 +00:00
Pablo Polvorin
3336d66fc4
Host argument for ejabberd_hooks's functions must be in binary() format.
...
SVN Revision: 1932
2009-03-01 19:03:35 +00:00
Badlop
19d27258d9
* src/mod_pubsub/node_default.erl: Fix that non-subscriber could
...
fetch items from Authorize node (thanks to Brian Cully)(EJAB-873)
SVN Revision: 1930
2009-02-27 23:56:46 +00:00
Pablo Polvorin
58e4b98d61
Fix small bug introduced in revision 1924.
...
SVN Revision: 1929
2009-02-27 21:09:44 +00:00
Badlop
c73e87e9c8
Merge fix from trunk r1910
...
* src/web/ejabberd_http.erl: Added a workaround for inet:peername
returning 'ebadf'
SVN Revision: 1928
2009-02-27 16:19:19 +00:00
Badlop
6482c11f92
* src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
...
and recent Openfire (thanks to Philipp Hancke)(EJAB-877)
SVN Revision: 1926
2009-02-27 15:42:27 +00:00
Christophe Romain
f4a952032a
cosmetic changes
...
SVN Revision: 1924
2009-02-27 03:19:53 +00:00
Badlop
34f6de0c84
* src/mod_pubsub/mod_pubsub.erl: Fix incorrect implementation of
...
Pubsub payload requirements (thanks to Andy Skelton)(EJAB-823)
SVN Revision: 1921
2009-02-25 21:17:14 +00:00
Pablo Polvorin
2678342c4a
mod_muc/mod_muc_log.erl: The logging code expect nicknames to be in list() format.
...
SVN Revision: 1920
2009-02-24 20:50:28 +00:00
Pablo Polvorin
0f53fea903
src/mod_echo.erl: Fix call to exmpp_xml:get_cdata_as_list/1.
...
SVN Revision: 1919
2009-02-24 20:25:57 +00:00
Pablo Polvorin
9b1e5928bd
Remove unused var
...
SVN Revision: 1918
2009-02-24 20:07:32 +00:00
Pablo Polvorin
31ef821e46
Exmpp related fixed to the external components service.
...
SVN Revision: 1917
2009-02-24 18:52:37 +00:00
Pablo Polvorin
3119badb2b
Removed a couple of expensive function calls used as arguments for
...
?DEBUG macros. All arguments used in the ?DEBUG macro are strictly
evaluated (even if the loglevel is higher).
The same is true for all log macros defined in ejabberd.hrl.
We might need to use lazy evaluation for the arguments, when they
are expensive to generate (wrap the arguments lists in a fun).
SVN Revision: 1915
2009-02-24 03:04:58 +00:00
Pablo Polvorin
acae6e20de
* Use exmpp_jid:to_binary/1 when possible.
...
* ejabberd_odbc:escape/1 now can escape binaries too. This
avoid the need to convert a binary value to list() just to
sql-escape it. The escaped value returned is allways a list()
(ejabberd's odbc drivers only works on lists())
SVN Revision: 1914
2009-02-23 19:45:55 +00:00
Christophe Romain
7a17baccac
Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854)
...
SVN Revision: 1913
2009-02-23 15:58:21 +00:00
Pablo Polvorin
4956259124
src/mod_roster.erl: Bugfix in remove_user/2, values already in binary() format.
...
SVN Revision: 1909
2009-02-21 18:07:37 +00:00
Badlop
a5f70e15a2
* src/ejabberd_auth.erl: Password is undefined when using digest
...
SVN Revision: 1908
2009-02-21 14:41:29 +00:00
Pablo Polvorin
2df100213b
mod_configure: Fix bug in form generation
...
SVN Revision: 1893
2009-02-20 16:34:56 +00:00
Pablo Polvorin
e989d41d50
"remove_user" hook actualized to expect binary arguments.
...
Fix webadmin code that performs addition / removal of users.
SVN Revision: 1892
2009-02-20 15:30:16 +00:00
Christophe Romain
edc0a9ac87
fix nodetree plugin resolver, and backport last changes from trunk
...
SVN Revision: 1890
2009-02-19 11:29:01 +00:00
Pablo Polvorin
5334a2d965
Bugfix: mod_announce.erl:get_title/2 now accepts node argument in binary() or list() format.
...
SVN Revision: 1887
2009-02-18 18:14:06 +00:00
Pablo Polvorin
7c10f3422a
src/web/ejabberd_web_admin.erl, src/web/ejabberd_web_admin.hrl:
...
Many exmpp related fixes. Fix a bug when displaying users lists,
if we can't access the 'offline_msg' mnesia table (using mod_offline_odbc).
This fix should be temporal, we should find a better way to manage this
situation.
src/web/ejabberd_http.erl: Language must be in binary() format.
src/translate.erl: Remove a debug call to io:format/2.
src/ejabberd_sm.erl, src/mod_configure.erl, src/mod_disco.erl:
ejabberd_sm:get_user_resources/2 returns resources as binary().
src/ejabberd_sm.erl: Bugfix in get_user_info/3.
SVN Revision: 1886
2009-02-18 18:03:11 +00:00
Pablo Polvorin
ea62092d6e
src/ejabberd_auth.erl: Fix: for legacy authentication, the Digest parameters could be 'undefined'.
...
src/mod_muc/mod_muc_room.erl: Typo.
src/ejabberd_c2s.erl: Remove comment for an already done TODO.
SVN Revision: 1885
2009-02-18 13:48:06 +00:00
Christophe Romain
e977d099e2
prevent from calling get_vh_registered_users/2 when not available
...
SVN Revision: 1871
2009-02-13 15:01:55 +00:00
Jean-Sébastien Pédron
bf82bac328
o Document the type of the argument(s) and the returned type of every
...
functions.
o Add guardians expression to exported functions to ensure at an early
stage that we were given the right arguments.
o Fix table conversion to exmpp; many fields were left as string(),
preventing matching from working correctly.
o In user_roster_item_parse_query/4, fix a bug where the same variable
was used for two distinct purpose.
o In user_roster_item_parse_query/4, fix a bad usage of
exmpp_jid:jid_to_list/1.
PR: EJABP-1
SVN Revision: 1867
2009-02-06 13:43:40 +00:00
Jean-Sébastien Pédron
25bd2bc7fe
Document the short JID type.
...
PR: EJABP-1
SVN Revision: 1866
2009-02-06 13:35:40 +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
8290026940
o Document the type of the argument(s) and the returned type of every
...
functions.
o Add guardians expression to many functions of ejabberd_auth and
ejabberd_auth_anonymous to ensure at an early stage that we were given
the right arguments. Other modules are not changed because they are only
used by ejabberd_auth which already does the check.
PR: EJABP-1
SVN Revision: 1863
2009-02-05 11:13:01 +00:00
Jean-Sébastien Pédron
69a2194efe
exmpp_server_sasl:next_step/1 returns the mechanism as list() again, so
...
the call to binary_to_list/1 isn't necessary anymore.
PR: EJABP-1
SVN Revision: 1853
2009-01-23 14:06:48 +00:00
Jean-Sébastien Pédron
b5c8b99272
Document every functions to clarify the types to give and returned.
...
PR: EJABP-1
SVN Revision: 1852
2009-01-23 10:10:33 +00:00
Badlop
35926b96b4
* 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
Pablo Polvorin
d1cf37bbec
Small fixes
...
SVN Revision: 1849
2009-01-22 22:19:03 +00:00
Jean-Sébastien Pédron
4417608b27
Document every functions to clarify the types to give and returned.
...
PR: EJABP-1
SVN Revision: 1846
2009-01-22 15:54:03 +00:00
Jean-Sébastien Pédron
a105dcb060
In get_vh_session_list/1, remove a bad list_to_binary/1; now that
...
exmpp_stringprep return the correct type, it was used on a binary().
PR: EJABP-1
SVN Revision: 1845
2009-01-22 15:52:30 +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
376ee2ed90
o In process_iq_get/3 and process_iq_set/3, use binary() version of
...
LUser and LServer.
o In convert_to_exmpp2/2, user and server are stored as binary().
PR: EJABP-1
SVN Revision: 1840
2009-01-21 13:31:14 +00:00
Jean-Sébastien Pédron
2f1397c50e
Use string() version of UserName and UserHost.
...
PR: EJABP-1
SVN Revision: 1839
2009-01-21 13:30:18 +00:00
Jean-Sébastien Pédron
cdbb000638
Return invalid-mechanism when a mechanism isn't supported instead of
...
no-mechanism, which wasn't standard-compliant.
PR: EJABP-1
SVN Revision: 1838
2009-01-21 13:07:55 +00:00
Jean-Sébastien Pédron
8a413018c2
In match_acl/3, use string() version of User/Server/Resource to match an
...
ACL.
PR: EJABP-1
SVN Revision: 1837
2009-01-21 12:44:36 +00:00
Pablo Polvorin
03f2de75f5
Typo (prolists -> proplists).
...
SVN Revision: 1833
2009-01-19 17:45:11 +00:00
Jean-Sébastien Pédron
38c0f3cdc8
Replace remaining calls to deprecated API:
...
o In src/cyrsasl_digest.erl, replace hijacked usage of
xml:get_attr_s/2 by proper calls to proplists:get_value/3.
o Still in src/cyrsasl_digest.erl, replace a call to
stringprep:tolower/1 by exmpp_stringprep:to_lower/1.
o In src/ejabberd_service.erl, replace a call to xml:crypt/1 by
exmpp_xml:escape_using_entities/1.
PR: EJABP-1
SVN Revision: 1832
2009-01-19 15:58:16 +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
Pablo Polvorin
e2ee44617c
translate.erl: Bugfix, ?MYLANG macro returns a list().
...
SVN Revision: 1828
2009-01-19 13:44:43 +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
Jean-Sébastien Pédron
8a27b5446d
Fix accesses to the new #jid opaque type.
...
PR: EJABP-1
SVN Revision: 1825
2009-01-19 10:14:55 +00:00
Jean-Sébastien Pédron
2cc2039ad8
Merge from trunk (r1734 to r1752).
...
Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1737, r1740, r1745, r1747, r1748.
Additionnaly, any deprecated content was removed from jlib.hrl. This
leaves only the new RSM records.
Warning: Ejabberd may be broken until the merge is completly finished.
PR: EJABP-1
SVN Revision: 1824
2009-01-19 10:14:04 +00:00
Pablo Polvorin
04f6a2be37
Store host and room name as binary(). Use jid_to_binary() instead of jid_to_list().
...
SVN Revision: 1821
2009-01-15 19:41:06 +00:00
Pablo Polvorin
2538001b08
Store registered nicknames, rooms and domains as binary().
...
Use document_to_iolist/1 and iolist_size/1 instead of document_to_list/1.
SVN Revision: 1820
2009-01-15 15:21:54 +00:00
Pablo Polvorin
e8f630b93a
mod_pubsub: initial update to new hooks API (using binaries). mod_pubsub is still unusable with exmpp.
...
SVN Revision: 1809
2009-01-12 18:17:05 +00:00
Pablo Polvorin
49210e3099
Apply commit 1212 (caps handling fix), was incorrectly overwritten on 1770.
...
SVN Revision: 1807
2009-01-12 18:15:44 +00:00
Pablo Polvorin
96c0ff44f9
Fix typo
...
SVN Revision: 1806
2009-01-12 15:51:22 +00:00
Christophe Romain
56bccce713
fix previous fix misplacing (EJAB-840)
...
SVN Revision: 1803
2009-01-11 06:24:42 +00:00
Christophe Romain
89be1c2ede
fix owners cache and fix unsubscribe permissions (EJAB-840)
...
SVN Revision: 1800
2009-01-11 02:05:41 +00:00
Pablo Polvorin
c77f7e727b
Update gen_iq_handler API, require the 'Host' argument to be in binary() format.
...
Fix bug in vcard user search, odbc backend.
SVN Revision: 1796
2009-01-10 16:10:12 +00:00
Christophe Romain
36080fb682
fix unsubscription of full jid subscribed node (EJAB-839)
...
SVN Revision: 1795
2009-01-10 13:40:38 +00:00
Pablo Polvorin
98f51dc91f
Adapt to new exmpp API where get_id/1, get_lang/1, get_initiating_entity/1, get_receiving_entity/1 and get_type/1 returns binary().
...
SVN Revision: 1791
2009-01-09 19:18:46 +00:00
Christophe Romain
d2524b20d5
minor pubsub fixes
...
SVN Revision: 1782
2009-01-08 18:44:11 +00:00
Christophe Romain
068c93e562
fix EJAB-701 and EJAB-836
...
SVN Revision: 1781
2009-01-08 17:27:47 +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
Pablo Polvorin
2cbd61f268
Fix typo in mod_roster
...
SVN Revision: 1773
2009-01-05 15:41:53 +00:00
Pablo Polvorin
4827db4f56
Big #jid to binary() conversion.
...
Internal tables (ejabberd_router, ejabberd_sm, ejabberd_hooks, mod_last, mod_roster) use binary() as storage.
Basic test using the ODBC backend.
SVN Revision: 1770
2009-01-03 15:15:38 +00:00
Christophe Romain
1a44fe29b4
PubSub: Added access-whitelist and member-affiliation features (EJAB-780)
...
SVN Revision: 1769
2009-01-03 00:58:18 +00:00
Christophe Romain
e032a8c54f
PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix
...
SVN Revision: 1767
2009-01-03 00:29:36 +00:00
Christophe Romain
214ef31053
Improve handling of PEP sent to external contacts (EJAB-825)
...
SVN Revision: 1751
2008-12-23 13:58:38 +00:00
Christophe Romain
978adbbd94
Fix send_last_published_item issue when running on clustered table (EJAB-793)
...
SVN Revision: 1741
2008-12-20 00:01:26 +00:00
Christophe Romain
e6535dcc67
Check option of the nodetree instead of checking configuration
...
SVN Revision: 1738
2008-12-18 13:46:30 +00:00
Pablo Polvorin
d3ddf10839
mod_muc_room.erl: Fix bug in MUC invite.
...
SVN Revision: 1736
2008-12-17 16:24:15 +00:00
Jean-Sébastien Pédron
69805f36fa
Merge from trunk (r1730 to r1734).
...
PR: EJABP-1
SVN Revision: 1735
2008-12-17 13:52:44 +00:00
Jean-Sébastien Pédron
6a3436b1c4
Merge from trunk (r1709 to r1730).
...
Ejabberd should be usable again.
PR: EJABP-1
SVN Revision: 1731
2008-12-16 13:16:56 +00:00
Jean-Sébastien Pédron
62f9f6e6c5
Convert to exmpp the parts in mod_pubsub recently merged from trunk.
...
Warning: Ejabberd is unusable because the rest of trunk hasn't been
merged yet!
PR: EJABP-1
SVN Revision: 1730
2008-12-16 10:31:08 +00:00
Christophe Romain
96aaba738b
fix get_item_name deadlock on transaction
...
SVN Revision: 1729
2008-12-15 19:58:53 +00:00
Jean-Sébastien Pédron
f83fc51960
Replace stringprep by exmpp_stringprep.
...
PR: EJABP-1
SVN Revision: 1726
2008-12-10 14:44:08 +00:00
Christophe Romain
e1575e3177
fix typo bug injected in r1712
...
SVN Revision: 1725
2008-12-09 22:42:34 +00:00
Christophe Romain
3d28a7837d
minor bugfix
...
SVN Revision: 1723
2008-12-09 22:09:30 +00:00
Christophe Romain
9f2fda6060
merge to lattest trunk r1716
...
SVN Revision: 1720
2008-12-09 00:32:36 +00:00
Jean-Sébastien Pédron
3bfb2b5cc1
Merge from trunk (r1692 to r1709).
...
PR: EJABP-1
SVN Revision: 1710
2008-12-08 12:02:27 +00:00
Jean-Sébastien Pédron
82b97b9639
Finish the conversion of mod_pubsub to Exmpp.
...
PR: EJABP-1
SVN Revision: 1709
2008-12-08 11:21:32 +00:00
Jean-Sébastien Pédron
d01c24bd23
Fix acl:match_rule/3 call. It takes a #jid record, not a short JID.
...
PR: EJABP-1
SVN Revision: 1708
2008-12-08 11:20:21 +00:00
Jean-Sébastien Pédron
163d185776
First pass of Exmpp conversion for mod_pubsub.
...
CAUTION:
o Several modules aren't converted yet.
o Existent Mnesia tables written to disc are not updated.
o There must be bugs, mostly because of the mix between #jid record
and short JIDs.
PR: EJABP-1
SVN Revision: 1705
2008-12-05 15:13:09 +00:00
Jean-Sébastien Pédron
6305ddca18
Add the module and function names to the error message, when a module
...
crash.
SVN Revision: 1704
2008-12-05 15:08:03 +00:00
Jean-Sébastien Pédron
b82b66fdf0
Update Exmpp XML parser options.
...
SVN Revision: 1703
2008-12-05 15:06:49 +00:00
Jean-Sébastien Pédron
b425093813
Convert mod_proxy65 to exmpp.
...
SVN Revision: 1701
2008-12-03 14:34:43 +00:00
Jean-Sébastien Pédron
f30d2b9f1c
Fix two warnings about unused variables.
...
PR: EJABP-1
SVN Revision: 1696
2008-12-01 15:54:57 +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
bd300e870c
Convert mod_muc to Exmpp.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1692
2008-12-01 15:01:27 +00:00
Jean-Sébastien Pédron
e06f533f6b
Start the exmpp application.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1691
2008-12-01 15:00:36 +00:00
Jean-Sébastien Pédron
7088ba88a9
o In store_last_info/4, fix a bug where the status was not converted to
...
list before calling ejabberd_odbc:escape/1.
o In get_last_info/2, fix a bug where the status was returned as a list
instead of a binary.
SVN Revision: 1690
2008-12-01 12:16:41 +00:00
Jean-Sébastien Pédron
0313adaec6
Convert to exmpp.
...
PR: EJABP-1
SVN Revision: 1663
2008-10-20 10:34:00 +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
3190c0ed6c
Convert to exmpp.
...
PR: EJABP-1
SVN Revision: 1649
2008-10-13 09:39:58 +00:00
Jean-Sébastien Pédron
461a5eb315
Convert to exmpp.
...
PR: EJABP-1
SVN Revision: 1648
2008-10-13 09:39:18 +00:00
Jean-Sébastien Pédron
01ef834b82
Remove the deprecated list of converted modules.
...
PR: EJABP-1
SVN Revision: 1647
2008-10-13 09:38:34 +00:00
Jean-Sébastien Pédron
0211c8145d
Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1.
...
PR: EJABP-1
SVN Revision: 1646
2008-10-13 09:37:48 +00:00
Jean-Sébastien Pédron
4a9892fa15
Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1 and change the
...
error handling.
PR: EJABP-1
SVN Revision: 1628
2008-10-10 15:24:47 +00:00
Jean-Sébastien Pédron
71bfefa788
Convert to exmpp.
...
PR: EJABP-1
SVN Revision: 1627
2008-10-10 15:23:58 +00:00
Jean-Sébastien Pédron
071c858055
Don't start stringprep_sup.
...
PR: EJABP-1
SVN Revision: 1626
2008-10-10 14:58:35 +00:00
Jean-Sébastien Pédron
0244963935
Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1 and change the
...
error handling.
PR: EJABP-1
SVN Revision: 1625
2008-10-10 14:57:44 +00:00
Jean-Sébastien Pédron
3adb238b31
Fix a bug where the wrong module was called (jlib instead of exmpp_jid).
...
PR: EJABP-1
SVN Revision: 1624
2008-10-10 14:41:26 +00:00
Jean-Sébastien Pédron
e3100110f0
Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1 and change the
...
error handling.
PR: EJABP-1
SVN Revision: 1623
2008-10-10 14:40:04 +00:00
Jean-Sébastien Pédron
5224a796cc
Replace jlib:iq_to_xml/1 by exmpp_iq:iq_to_xmlel/1.
...
PR: EJABP-1
SVN Revision: 1622
2008-10-10 14:38:52 +00:00
Jean-Sébastien Pédron
285b3858dd
Replace jlib:*prep/1 by exmpp_stringprep:*prep/1 and change the error
...
handling.
PR: EJABP-1
SVN Revision: 1621
2008-10-10 14:37:26 +00:00
Jean-Sébastien Pédron
53bea055aa
Remove a remaining jlib:jid_remove_resource/1 call.
...
PR: EJABP-1
SVN Revision: 1620
2008-10-10 14:36:25 +00:00
Jean-Sébastien Pédron
129b0e99cf
Replace jlib:nodeprep/1 by exmpp_stringprep:nodeprep/1 and change the
...
error handling.
PR: EJABP-1
SVN Revision: 1619
2008-10-10 14:35:17 +00:00
Jean-Sébastien Pédron
c0e4af9ac0
Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1 and change the
...
error handling.
PR: EJABP-1
SVN Revision: 1618
2008-10-10 14:33:16 +00:00
Jean-Sébastien Pédron
ccd94bb734
Fix a buf where a tuple was passed to exmpp_jid:jid_to_list/1 instead of
...
a #jid. Now we use exmpp_jid:jid_to_list/3.
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1617
2008-10-10 08:16:29 +00:00
Jean-Sébastien Pédron
e1b3bd611d
Fix a bug where legacy authentication informations were not search among
...
the query children but among the IQ children.
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1616
2008-10-10 08:14:08 +00:00
Jean-Sébastien Pédron
6ab7e339bd
Fix handling of unauthenticated stanzas which are not request IQ.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1615
2008-10-09 11:54:42 +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
aaecdc4b8a
Convert to exmpp.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1611
2008-10-07 12:20:09 +00:00
Jean-Sébastien Pédron
78466384c4
Convert to exmpp.
...
PR: EJABP-1
SVN Revision: 1610
2008-10-07 09:55:38 +00:00
Jean-Sébastien Pédron
ca7a0813b4
Fix a bug where an error stanza was not created correctly, leading to
...
ejabberd_c2s crash.
PR: EJABP-1
SVN Revision: 1609
2008-10-07 09:54:53 +00:00
Jean-Sébastien Pédron
bc0d8613ab
Fix status handling by always using binaries: until now, we were mixing
...
lists and binaries in a non-working way.
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1608
2008-10-06 15:16:09 +00:00
Jean-Sébastien Pédron
0434c1424a
The Mnesia table wasn't updated when converting from an old schema.
...
PR: EJABP-1
SVN Revision: 1607
2008-10-06 15:14:01 +00:00
Jean-Sébastien Pédron
3f8a303286
Convert to exmpp.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1606
2008-10-06 15:01:36 +00:00
Jean-Sébastien Pédron
5ceffdd5a7
Fix a confusion between #jid and tuples.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1604
2008-10-06 15:00:34 +00:00
Jean-Sébastien Pédron
01da93bf70
mod_privacy & friends may return an empty list.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1603
2008-10-06 14:58:45 +00:00
Jean-Sébastien Pédron
028a3c2ded
Fix a bug where we were matching on #iq.type instead of #iq.kind,
...
resulting in bad-request sent to the client.
PR: EJABP-1
SVN Revision: 1602
2008-10-06 14:56:36 +00:00
Jean-Sébastien Pédron
1698b8ec04
o In start/2 and stop/1, the IQ registration must use a namespace as
...
atom, not list.
o The functions process_local_iq/3, process_sm_iq/3 and get_last/3
receive an #iq, not an #xmlel.
o In store_last_info/4 and remove_user/2, add try/catch block around
exmpp_stringprep:*prep/1 uses.
SVN Revision: 1594
2008-10-02 14:59:48 +00:00
Jean-Sébastien Pédron
9e018532c8
o In #jid, when the node isn't specified, it defaults to the atom
...
"undefined", not an empty binary.
o Fix a bug where we expected an #xmlelement to have only one #xmlcdata
child.
SVN Revision: 1593
2008-10-02 13:52:39 +00:00
Jean-Sébastien Pédron
24cb7cb039
exmpp_xml:get_element_by_name/2 is deprecated; use
...
exmpp_xml:get_element/2 instead.
SVN Revision: 1592
2008-10-02 13:34:52 +00:00
Jean-Sébastien Pédron
7c28aba6a1
Fix a bug where a JID represented as a tuple was used in a function
...
expecting a #jid.
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1591
2008-10-02 13:17:49 +00:00
Jean-Sébastien Pédron
2309f9b8bc
Fix multiple bugs in ODBC mods.
...
PR: EJABP-1
Submitted by: Pablo Polvorin <pablo.polvorin@process-one.net>
SVN Revision: 1589
2008-10-01 09:41:57 +00:00
Jean-Sébastien Pédron
ddcb94649d
Fill exmpp_xml known list with the nss/names/attrs used by this module.
...
SVN Revision: 1585
2008-09-29 13:19:11 +00:00
Jean-Sébastien Pédron
5f7e16eac3
Add the {autoload_known, true} flag to the XML parser options. This
...
allows modules to extend the known nss/names/attrs with their own data.
SVN Revision: 1584
2008-09-29 13:17:21 +00:00
Jean-Sébastien Pédron
da034b3090
Fix a bug in #xmlel construction: children must be a list.
...
SVN Revision: 1583
2008-09-29 11:30:25 +00:00
Jean-Sébastien Pédron
12d515a8fe
Convert to exmpp (not tested yet).
...
SVN Revision: 1582
2008-09-29 11:29:09 +00:00
Jean-Sébastien Pédron
f5f3c85112
Remove compatibility code (not tested yet).
...
SVN Revision: 1581
2008-09-29 10:38:04 +00:00
Jean-Sébastien Pédron
d8153b702a
o Add try/catch block around exmpp_stringprep:*prep/1 uses.
...
o Add table conversion.
o In get_last/3, do not convert status to binary because it's already
one.
SVN Revision: 1580
2008-09-29 10:34:06 +00:00
Jean-Sébastien Pédron
9a4f5bb2d9
When the status is not specified in a presence stanza, default to an
...
empty binary, not an empty string; this is what mod_last expects.
SVN Revision: 1579
2008-09-29 10:31:24 +00:00
Jean-Sébastien Pédron
7624284070
Remove compatilibity code.
...
SVN Revision: 1578
2008-09-29 09:42:46 +00:00
Jean-Sébastien Pédron
c32cbd90e8
Fix a bug in parse_xdata_submit/1 and parse_xdata_fields/2 where
...
exmpp_xml:get_attribute_from_list/3 was called with only 2 arguments;
this code has not been updated when exmpp_xml's API changed...
SVN Revision: 1577
2008-09-29 09:42:05 +00:00
Jean-Sébastien Pédron
c068d20588
In mod_offline:
...
o Remove any compatibility code: the core of Ejabberd expects new
structures.
o Add table conversion.
o Add try/catch block around exmpp_stringprep:*prep/1 uses.
To permit the complete removal of the compatibility code, jlib had to be
changed too: the timestamp_to_xml/1 function now returns an #xmlel.
SVN Revision: 1575
2008-09-25 10:46:00 +00:00
Jean-Sébastien Pédron
c74ab439ef
Convert to exmpp.
...
SVN Revision: 1574
2008-09-23 13:11:05 +00:00
Jean-Sébastien Pédron
44c77364ce
Fix a typo in the exmpp_stringprep module name.
...
SVN Revision: 1573
2008-09-23 13:10:33 +00:00
Jean-Sébastien Pédron
0dbbf53fbe
o Fix a misuse of exmpp_stanza:error/2: the namespace argument (the
...
first one) was missing.
o Fix a bug in process_privacy_iq/4 where the #iq record was not
converted back to an #xmlel before calling ejabberd_router:route/3.
SVN Revision: 1572
2008-09-23 13:09:32 +00:00
Jean-Sébastien Pédron
052d006c88
Fix a typo in the exmpp_stringprep module name.
...
SVN Revision: 1571
2008-09-23 13:06:45 +00:00
Jean-Sébastien Pédron
0e91ea9e5f
o Fix a bug in process_sm_iq/3 where a badmatch exception was raised
...
when the user didn't have a vCard.
o Fix a bug in remove_user/2 where the exmpp_jid module was use instead
of exmpp_stringprep.
SVN Revision: 1570
2008-09-23 13:05:43 +00:00
Jean-Sébastien Pédron
5803c51633
Convert to exmpp.
...
SVN Revision: 1568
2008-09-22 11:18:08 +00:00
Jean-Sébastien Pédron
35a7342416
o Remove unappropriate comments in get_sm_features/5.
...
o Use the '_s' variants of NS_* macros instead of a call to
atom_to_list/1 in do_route/4.
o A call to the stringprep module was left in filter_fields/3.
SVN Revision: 1567
2008-09-22 11:17:23 +00:00
Jean-Sébastien Pédron
e9d7ac68da
o Fix a bug in get_in_pending_subscriptions() where the type of the
...
presence stanza was lost.
o Reorganize a few lines in user_roster() to match mod_roster_odbc.
SVN Revision: 1566
2008-09-18 14:55:43 +00:00
Jean-Sébastien Pédron
56a0c8ed1d
Convert to exmpp.
...
SVN Revision: 1565
2008-09-18 14:55:03 +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
414948d822
VCard are now stored as #xmlel. Mnesia tables are converted during
...
startup.
SVN Revision: 1553
2008-08-27 12:39:49 +00:00
Jean-Sébastien Pédron
02e6bf8759
handle_cast({disco_response, ...}, ...) now receives an #iq record:
...
update the code to handle this.
SVN Revision: 1552
2008-08-27 09:46:25 +00:00
Jean-Sébastien Pédron
8baed08641
Remove a debugging io:format/2.
...
SVN Revision: 1551
2008-08-27 09:45:01 +00:00
Jean-Sébastien Pédron
4e39f4cab1
o Remove compatibility code. Use the atom 'undefined' in JIDs (normal
...
and short).
o Add try/catch blocks where Exmpp can raise exceptions.
o Remove some unused code.
o Convert on-disk Mnesia database: JIDs, extra XML elements and
askmessage are concerned.
o By default, 'askmessage' is now an empty binary instead of an empty
string, for consistency's sake.
o Fix some bugs.
SVN Revision: 1547
2008-08-26 13:59:04 +00:00
Jean-Sébastien Pédron
9f0d79da9a
o Use the new functions from jlib.
...
o Remove the compatibility code. It's becoming confusing to handle every
case every where. Also, in JIDs (normal and short), the atom "undefined'
is expected, not the empty string anymore!
SVN Revision: 1546
2008-08-26 13:38:49 +00:00
Jean-Sébastien Pédron
80fcd2eb56
Remove commented-out code and use proper variable names.
...
SVN Revision: 1545
2008-08-26 13:00:35 +00:00
Jean-Sébastien Pédron
5aead42964
Use the new short_prepd_jid/1 function from jlib.
...
SVN Revision: 1544
2008-08-26 12:58:13 +00:00
Jean-Sébastien Pédron
ab75683bc9
short_jid/1 and short_bare_jid/1 now produce a short JID from the
...
user-provided JID parts. To obtain a short JID from the STRINGPREP'd
parts, use the new short_prepd_jid/1 and short_prepd_bare_jid/1
functions.
SVN Revision: 1543
2008-08-26 12:56:45 +00:00
Jean-Sébastien Pédron
d8c3aae412
Convert to the new #iq record from Exmpp.
...
SVN Revision: 1524
2008-08-14 13:36:11 +00:00
Jean-Sébastien Pédron
5e78c53572
Remove the compatibility layer and always call modules with the new #iq
...
record from Exmpp.
SVN Revision: 1523
2008-08-14 13:34:30 +00:00
Jean-Sébastien Pédron
44d3e844a3
Accept 'undefined' as a language and treat it as the empty string.
...
SVN Revision: 1522
2008-08-14 13:32:31 +00:00
Jean-Sébastien Pédron
85c2097ece
Update to use the new names used in exmpp_jid.
...
SVN Revision: 1515
2008-08-06 13:51:42 +00:00
Jean-Sébastien Pédron
cb20c9b0d7
Update to use the new exmpp_xml:get_attribute/{3,4} API.
...
SVN Revision: 1514
2008-08-06 13:46:23 +00:00
Jean-Sébastien Pédron
d9a493561b
Convert to exmpp.
...
SVN Revision: 1513
2008-08-06 13:44:58 +00:00
Jean-Sébastien Pédron
70956ece12
Convert to exmpp.
...
SVN Revision: 1492
2008-07-25 14:26:59 +00:00
Jean-Sébastien Pédron
adaf392156
o Finish conversion to exmpp for mod_caps.
...
o In ejabberd_loca, IQ response handler are now always called with
arguments in the new format.
SVN Revision: 1469
2008-07-22 14:51:19 +00:00
Jean-Sébastien Pédron
37b99639d4
Convert to exmpp.
...
SVN Revision: 1468
2008-07-22 14:03:11 +00:00
Jean-Sébastien Pédron
a8ab6c1568
Add support for #xmlel to parse_xdata_submit/1 and friends. This fixes
...
the user search in mod_vcard.
SVN Revision: 1466
2008-07-21 15:54:47 +00:00
Jean-Sébastien Pédron
4a1e45070e
One call to jlib:jid_to_string/1 was remaining.
...
SVN Revision: 1465
2008-07-21 15:53:58 +00:00
Jean-Sébastien Pédron
b33ac47228
Convert to exmpp.
...
SVN Revision: 1464
2008-07-21 15:30:32 +00:00
Jean-Sébastien Pédron
6e91399922
Convert to exmpp.
...
SVN Revision: 1463
2008-07-21 15:29:52 +00:00
Jean-Sébastien Pédron
75a8be230b
Prepare gen_iq_handler to pass arguments in the new format to a built-in
...
list of modules known to support them. Other modules will still receive
arguments in the old format.
SVN Revision: 1462
2008-07-21 15:28:44 +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
532e8ee228
Start conversion to exmpp. For now, only direct calls from ejabberd_c2s
...
are done. Calls through gen_iq_handler aren't.
SVN Revision: 1457
2008-07-17 15:26:48 +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
Jean-Sébastien Pédron
5610d00b4d
Convert to exmpp. Note that this module hasn't been tested yet!
...
SVN Revision: 1434
2008-07-11 12:41:48 +00:00
Jean-Sébastien Pédron
8bfccb42a9
Exmpp now takes care of stanza serialization and compatible namespaces.
...
SVN Revision: 1433
2008-07-11 12:40:49 +00:00
Jean-Sébastien Pédron
7ca5bebab3
Convert to exmpp.
...
SVN Revision: 1422
2008-07-09 09:16:03 +00:00
Jean-Sébastien Pédron
d5aa4be7e5
Convert #xmlelement returned by the 'c2s_stream_features' hook to
...
#xmlel.
SVN Revision: 1421
2008-07-09 09:14:19 +00:00
Jean-Sébastien Pédron
1a687a4f1a
SASL errors are now atoms, not strings anymore.
...
SVN Revision: 1420
2008-07-08 15:43:52 +00:00
Jean-Sébastien Pédron
13b78b1ad2
Routing is now done with #xmlel. A warning is printed if those modules
...
have to route an old #xmlelement.
SVN Revision: 1406
2008-07-01 15:51:34 +00:00
Jean-Sébastien Pédron
48cf5cb84a
Do not use the #iq record anymore internally. However it's still created
...
and passed to other modules.
SVN Revision: 1405
2008-07-01 14:25:02 +00:00
Jean-Sébastien Pédron
5317dd64d7
Change warning message.
...
SVN Revision: 1404
2008-07-01 14:20:20 +00:00
Jean-Sébastien Pédron
a25609f66b
Accept new #xmlel in functions that create #iq. A warning is printed
...
when these functions are called with an old #xmlelement.
SVN Revision: 1403
2008-07-01 14:19:36 +00:00
Jean-Sébastien Pédron
d6e6432a46
Convert to exmpp.
...
SVN Revision: 1402
2008-07-01 13:34:51 +00:00
Jean-Sébastien Pédron
094fa47f9f
Convert gen_iq_handler to exmpp.
...
SVN Revision: 1401
2008-07-01 10:21:35 +00:00
Jean-Sébastien Pédron
6f7cf2e58b
Use a function to convert to old structures instead of duplicating code
...
inside the module.
SVN Revision: 1400
2008-07-01 10:20:01 +00:00
Jean-Sébastien Pédron
b08ae07347
acl doesn't require conversion anymore.
...
SVN Revision: 1399
2008-07-01 09:46:57 +00:00
Jean-Sébastien Pédron
ffbf8d5faa
Convert acl to exmpp.
...
SVN Revision: 1398
2008-07-01 09:41:32 +00:00
Jean-Sébastien Pédron
f55274c7fb
o Use jlib:short_bare_jid/1.
...
o Rewrite is_auth_packet/1 to use new formats.
o Don't convert <presence/> before calling ejabberd_sm:set_presence/7.
o Don't convert broadcast children, because it's an internal special
element.
SVN Revision: 1397
2008-07-01 09:17:48 +00:00
Jean-Sébastien Pédron
b9074097da
Forgot to convert a <presence/> from the new to the old record.
...
SVN Revision: 1396
2008-07-01 09:13:49 +00:00
Jean-Sébastien Pédron
83a33726ce
Add function short_bare_jid/1.
...
SVN Revision: 1395
2008-07-01 09:12:59 +00:00
Jean-Sébastien Pédron
8c33e12616
Use the new clause of exmpp_stanza:reply_with_error/2, exmpp_iq:error/2,
...
exmpp_iq:error_without_original/2 and the new exmpp_jid:make_bare_jid/1.
SVN Revision: 1394
2008-07-01 08:01:06 +00:00
Jean-Sébastien Pédron
87218e1447
Convert to exmpp.
...
SVN Revision: 1393
2008-07-01 07:49:57 +00:00
Jean-Sébastien Pédron
06965000a5
Before doing any routing, the router print a warning if old structures
...
are used. Then it converts the structures to the old format and route
them. The router doesn't care about the structures format but the
conversion is necesary for code called from this module.
In C2S and S2S, no conversion is done before calling
ejabberd_router:route/3.
SVN Revision: 1392
2008-06-30 16:55:03 +00:00
Jean-Sébastien Pédron
cc033b3b98
o Use the new functions from jlib.
...
o Use the new exmpp_xml:node_to_list/3.
SVN Revision: 1391
2008-06-30 15:51:23 +00:00
Jean-Sébastien Pédron
290040ad9d
o Add function to convert to and from old ejabberd #jid record.
...
o Move function short_jid/1 from ejabberd_c2s.
SVN Revision: 1390
2008-06-30 15:49:58 +00:00
Jean-Sébastien Pédron
264e72830b
Convert to exmpp.
...
SVN Revision: 1389
2008-06-30 14:04:31 +00:00
Jean-Sébastien Pédron
d05c2ee8a1
Use -include_lib instead of -include to include exmpp.hrl. This is a
...
better solution than specifying the path (with -I) on erlc(1) command
line.
SVN Revision: 1388
2008-06-30 12:13:15 +00:00
Jean-Sébastien Pédron
b32aba27c1
o Use the new exmpp namespace macro names.
...
o Update send_element/2 to use exmpp new to_list functions.
SVN Revision: 1384
2008-06-27 13:46:08 +00:00
Jean-Sébastien Pédron
22e79490ff
Convert to exmpp.
...
SVN Revision: 1383
2008-06-26 15:48:19 +00:00
Jean-Sébastien Pédron
1a311a30b5
o Use a macro in ?DEFAULT_NS instead of the namespace atom directly.
...
o Comment DBGFSM our again.
o Remove macro ERR_SERVICE_UNAVAILABLE.
o In wait_for_auth and is_auth_packet, an empty resource is returned as
'undefined', not the empty string in the {auth, ...} tuple.
o In handle_sync_event, remove a debugging printf.
o In handle_info({route, ...}), use macro IS_PRESENCE & friends instead
of direct matching with NS_JABBER_CLIENT and name. This way, the S2S
doesn't have to change the namespace of all its incoming stanzas to
NS_JABBER_CLIENT.
o In send_element, for stanzas under the NS_JABBER_SERVER namespace, lie
to exmpp_xml by telling it that this namespace is the default one.
SVN Revision: 1382
2008-06-26 15:47:21 +00:00
Jean-Sébastien Pédron
999f3233bb
Fix short JID comparison in get_subscribed_and_online; it was using
...
'undefined' instead of empty strings.
SVN Revision: 1381
2008-06-25 13:27:03 +00:00
Jean-Sébastien Pédron
07651d712f
Finish ejabberd_c2s conversion with the functions related to offline
...
stanzas.
SVN Revision: 1380
2008-06-25 12:37:45 +00:00
Jean-Sébastien Pédron
6f931ce4fd
Convert all presence-related functions.
...
SVN Revision: 1378
2008-06-24 16:12:56 +00:00
Jean-Sébastien Pédron
e93e846e16
o Use the new exmpp_stream:opening_reply/3 function in wait_for_stream/2.
...
o The function terminate/3 is converted to exmpp.
SVN Revision: 1377
2008-06-24 09:44:56 +00:00
Jean-Sébastien Pédron
4e2e68a3fb
The handle_info clause that treats routing order is now converted.
...
In-memory sets and dict still use the short JID form with empty strings
for unspecified fields. Users are able to connect to ejabberd but some
features don't seem to work proprerly.
SVN Revision: 1376
2008-06-24 08:55:24 +00:00
Jean-Sébastien Pédron
e95df7999f
Convert JID to the expected form outside of the C2S (empty fields must
...
be set to the empty string). This fixes the broken routing.
SVN Revision: 1375
2008-06-23 11:47:10 +00:00
Jean-Sébastien Pédron
2a43998444
o Change the usage of #state.lang somewhat.
...
o Fix value of DefaultLang: it doesn't contain the whole serialized
attribute.
o Use exmpp_jid:make_bare_jid/2 more.
I started to work on the second half of the module and discovered
several annoying things:
o JID are represented in two forms: the #jid record and the
{N, D, R} tuple.
o Sometimes, #xmlelement may contain non-#xml* tuples in their
children. This is the case for some <presence/> stanzas. Their
children are used to pass random data.
I'm less and less convicted that ejabberd_c2s can be fully converted
without starting to work on other modules.
SVN Revision: 1370
2008-06-20 14:54:59 +00:00
Jean-Sébastien Pédron
389b5e6448
First bunch of modifications to use exmpp. All FSM state function are
...
updated. But other functions are not for now.
Users are able to connect to ejabberd but some features may not work.
SVN Revision: 1368
2008-06-20 12:52:29 +00:00
Jean-Sébastien Pédron
a19f280fcc
Enable the new #xmlel record.
...
SVN Revision: 1367
2008-06-20 12:50:20 +00:00
Jean-Sébastien Pédron
e4646a6788
Add exmpp detection.
...
SVN Revision: 1366
2008-06-20 12:49:39 +00:00
Jean-Sébastien Pédron
58bfea2ad1
Replace the use of xml_stream by exmpp_xmlstream. exmpp_xml is
...
configured to produce old #xmlelement records. exmpp_xmlstream is
configured to send old xmlstreamstart tuple.
Users are able to connect to ejabberd.
Next step: ejabberd_c2s.
SVN Revision: 1365
2008-06-19 10:23:52 +00:00
Badlop
5fdcb52306
* src/ejabberd.app: The ejabberd version number is defined in the
...
OTP application resource file, in the key 'vsn' (EJAB-657)
* src/ejabberd.hrl: The macro VERSION now consults the ejabberd
application key vsn
* src/configure.erl: Load the ejabberd application description
* doc/Makefile: Read ejabberd version from ejabberd.app vsn
* doc/api/Makefile: Likewise
SVN Revision: 1361
2008-06-18 21:33:48 +00:00
Christophe Romain
fe82bf3e81
temporary roster_groups_allowed (EJAB-655)
...
SVN Revision: 1359
2008-06-18 16:35:03 +00:00
Christophe Romain
638d789ae6
pubsub get_default bugfix (EJAB-656)
...
SVN Revision: 1358
2008-06-18 16:19:18 +00:00
Badlop
cbf63d06a8
* src/mod_muc/mod_muc_room.erl: Allow admins to send messages to
...
rooms even if not joined (EJAB-645)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1356
2008-06-13 18:55:26 +00:00
Badlop
e22913d46f
* src/ejabberd.cfg.example: Add registration_timeout (EJAB-653)
...
SVN Revision: 1355
2008-06-13 17:51:01 +00:00
Badlop
ff94e586eb
* src/ejabberd_c2s.erl: Bugfix: deliver messages when first
...
presence is Invisible (thanks to Dariusz Markowicz)(EJAB-262)
SVN Revision: 1348
2008-06-09 23:43:47 +00:00
Badlop
59201f1def
* src/msgs/pl.msg: Bugfix in arguments of translated string that
...
could crash the room (thanks to Anastasia Gornostaeva)
SVN Revision: 1345
2008-06-04 13:21:36 +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
110a4b4518
* src/odbc/odbc_queries.erl (del_user_return_password): Return
...
password (thanks to Oleg Palij)
SVN Revision: 1343
2008-05-31 17:09:13 +00:00
Mickaël Rémond
5e9576ffa3
* src/ejabberd_s2s.erl: Added s2s_send_packet and s2s_receive_packet hooks (EJAB-635).
...
* src/ejabberd_s2s_in.erl: Likewise.
SVN Revision: 1342
2008-05-22 10:53:49 +00:00
Mickaël Rémond
cf42ea0bcb
* src/ejabberd_c2s.erl: user_send_packet hook now called on all packets including presence packets (EJAB-634)
...
SVN Revision: 1341
2008-05-22 10:19:35 +00:00
Badlop
30f54a6bfc
* src/configure.ac: R12 support: remove compilation
...
warning (EJAB-630)
* src/configure: Likewise
* doc/guide.tex: Likewise
SVN Revision: 1334
2008-05-19 09:20:35 +00:00
Mickaël Rémond
8dae53abda
* src/ejabberd_s2s_out.erl: Fix compilation error.
...
SVN Revision: 1332
2008-05-18 12:34:52 +00:00
Mickaël Rémond
8a8a02431f
* src/ejabberd_s2s_out.erl: Avoid an harmless error (function clause in logs)
...
SVN Revision: 1331
2008-05-18 12:28:58 +00:00
Badlop
4e77bae206
* src/extauth.erl: Log strange responses from extauth script. Use
...
timeout (EJAB-627)
SVN Revision: 1330
2008-05-17 11:44:25 +00:00
Badlop
c892a60da5
* src/mod_muc/mod_muc_room.erl: Allow change_state of a room
...
SVN Revision: 1329
2008-05-16 18:05:03 +00:00
Christophe Romain
5bec1eedc1
Change FSMTIMEOUT to 30s
...
SVN Revision: 1328
2008-05-16 15:29:33 +00:00
Badlop
da56452fba
* src/mod_muc/mod_muc_room.erl: Return Forbidden error message
...
when user sends private message in a room that disallows
it (EJAB-595)
SVN Revision: 1323
2008-05-12 20:35: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
Mickaël Rémond
977a20700a
* src/mod_ip_blacklist.erl: Better error handling (EJAB-625).
...
SVN Revision: 1321
2008-05-09 19:53:06 +00:00
Mickaël Rémond
1a2bb06075
* src/mod_ip_blacklist.erl: ignore when we do not have the IP.
...
SVN Revision: 1320
2008-05-08 14:55:06 +00:00
Mickaël Rémond
e4f098a104
* src/mod_ip_blacklist.erl: Update the list every 6 hours.
...
SVN Revision: 1319
2008-05-05 16:31:48 +00:00
Mickaël Rémond
740ce75599
* src/mod_ip_blacklist.erl: Added C2S blacklist support (EJAB-625).
...
SVN Revision: 1318
2008-05-05 16:25:52 +00:00
Mickaël Rémond
a664579b58
* src/ejabberd_c2s.erl: Added C2S blacklist support (EJAB-625).
...
* src/mod_ip_blacklist.erl: Likewise.
* src/jlib.erl: Added IP format tuple to string function.
* src/ejabberd_socket.erl: Properly handled c2s start failure (happen for blacklisted IP).
SVN Revision: 1317
2008-05-05 16:22:06 +00:00
Alexey Shchepin
8267194d5e
* src/ejabberd_receiver.erl: Don't activate a socket untill its
...
receiver process is controlling it
SVN Revision: 1316
2008-05-04 07:38:24 +00:00
Christophe Romain
2304f8cbc8
XEP-0115 patch (EJAB-618)
...
SVN Revision: 1313
2008-04-30 08:49:39 +00:00
Badlop
ef531fb208
* src/ejabberd_s2s_out.erl: Improve confusing log message in s2s
...
connection: wait_for_validation connect timeout (EJAB-617)
SVN Revision: 1311
2008-04-29 16:59:03 +00:00