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

72 Commits

Author SHA1 Message Date
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
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
Jean-Sébastien Pédron
ff500d8297 Merge from trunk (r1787 to r1804). 
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.

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

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

PR:		EJABP-1

SVN Revision: 1829
 2009-01-19 14:47:33 +00:00
Jean-Sébastien Pédron
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
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
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
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
67a87af459 Merge from trunk (r1563 to r1613). 
PR:		EJABP-1

SVN Revision: 1614
 2008-10-08 12:02:30 +00:00
Jean-Sébastien Pédron
4eaa8e19c9 Merge from trunk (r1457 to r1563). 
SVN Revision: 1564
 2008-09-16 14:39:57 +00:00
Jean-Sébastien Pédron
07b1210b50 Merge revisions from 1444 to revision 1457 from trunk. 
SVN Revision: 1458
 2008-07-17 15:33:50 +00:00
Jean-Sébastien Pédron
574dbbfd08 Merge revisions from 1434 to revision 1444 from trunk. 
SVN Revision: 1445
 2008-07-15 08:45:05 +00:00
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
Badlop
04aec272db * src/odbc/ejabberd_odbc.erl: Start ODBC explicitely because 
Erlang R12 doesn't start automatically like in R11 and
older (thanks to Sergei Golovan)(EJAB-541)

SVN Revision: 1231
 2008-03-13 14:34:47 +00:00
Christophe Romain
9466b1a21f add pgsql driver monitoring 
SVN Revision: 1200
 2008-02-19 17:06:49 +00:00
Jérôme Sautret
0eb8aafc0d * odbc_queries: fix list_users queries with limit/offset. 
SVN Revision: 1188
 2008-02-12 13:23:35 +00:00
Jérôme Sautret
1309f26f06 * odbc_queries: fix list_users query with prefix. 
SVN Revision: 1187
 2008-02-12 12:49:41 +00:00
Badlop
2d2fcc8210 * doc/guide.tex: Updated copyright dates to 2008 
* src/*: Likewise

SVN Revision: 1153
 2008-01-15 17:02:57 +00:00
Mickaël Rémond
22f928122f * Applied copyright patch 3. 
SVN Revision: 1113
 2007-12-24 13:57:53 +00:00
Christophe Romain
1ba15b207c User count performance improvements 
SVN Revision: 1086
 2007-12-20 17:12:45 +00:00
Badlop
80b7abd8c8 * src/ejabberd_zlib/Makefile.win32: Compile 
all erl files found in the directory, so it isn't needed to provide
an explicit list of target files
* src/eldap/Makefile.win32: Likewise
* src/mod_irc/Makefile.win32: Likewise
* src/mod_muc/Makefile.win32: Likewise
* src/mod_proxy65/Makefile.win32: Likewise
* src/mod_pubsub/Makefile.win32: Likewise
* src/odbc/Makefile.win32: Likewise
* src/stringprep/Makefile.win32: Likewise
* src/tls/Makefile.win32: Likewise
* src/web/Makefile.win32: Likewise

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

SVN Revision: 1075
 2007-12-17 18:59:51 +00:00
Christophe Romain
f114517bbc mssql specific issue bugfix 
SVN Revision: 1074
 2007-12-17 14:10:26 +00:00
Christophe Romain
4b65154dd3 first patch to mssql quety, still one patch to be done 
SVN Revision: 1066
 2007-12-11 17:43:49 +00:00
Badlop
d625fc80fc * src/acl.erl and other 64 files: Remove Erlang module attribute 
'vsn' because it doesn't provide any worth feature, and it
difficults hot code update (EJAB-440)

SVN Revision: 1044
 2007-12-06 22:12:27 +00:00
Mickaël Rémond
7d68866c59 * src/odbc_queries.erl: Added a default define value so that we 
can recompile the file manually with a simple erlc command (with the
default generic value).

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

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

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

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

SVN Revision: 968
 2007-11-03 17:35:23 +00:00
Christophe Romain
665abff588 Added some missing NOT NULL restrictions 
SVN Revision: 952
 2007-09-28 13:33:27 +00:00
Mickaël Rémond
b0bb9a79c3 * src/mod_offline_odbc.erl: Implements quota for offline messages 
in relational database (EJAB-314)
* src/odbc/odbc_queries.erl: Likewise

SVN Revision: 893
 2007-08-28 14:36:39 +00:00
Jérôme Sautret
6fcef6f5c4 * src/odbc/ejabberd_odbc_sup.erl: Add an odbc_pool_size config file option to choose the number of SQL 
connection in each pool (EJAB-58).
* src/odbc/ejabberd_odbc.erl: Add an odbc_keepalive_interval config file option to perform a keep
alive query at given interval (EJAB-206).

SVN Revision: 879
 2007-08-16 16:37:00 +00:00
Mickaël Rémond
915d94b0dc * src/odbc/ejabberd_odbc.erl: UTF-8 support for MySQL5 (EJAB-318). 
SVN Revision: 868
 2007-08-12 15:39:01 +00:00
Mickaël Rémond
745be8373f * src/odbc/ejabberd_odbc.erl: Better error handling for MySQL native driver (EJAB-224). 
SVN Revision: 813
 2007-07-17 07:09:04 +00:00
Mickaël Rémond
3fe646c3cb * src/odbc/mssql.sql: Nickname cannot be null in rosterusers table (MSSQL) 
* src/odbc/mysql.sql: Likewise
* src/odbc/pg.sql: Likewise

SVN Revision: 809
 2007-07-09 17:22:09 +00:00
Mickaël Rémond
d2dd6eef09 * src/odbc/odbc_queries.erl: Added missing users_number/1 for MSSQL (EJAB-239). 
SVN Revision: 785
 2007-06-18 10:22:54 +00:00
Mickaël Rémond
c228e7aeb3 * src/Makefile.in: Added Dialyzer target (EJAB-189 - Thanks to Geoff Cant) 
* src/Makefile.in: Build XmppAddr.beam in a single pass
* src/mod_muc/Makefile.in: +debug_info directive support
* src/stringprep/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/web/Makefile.in: Likewise
* src/eldap/Makefile.in: Likewise
* src/mod_pubsub/Makefile.in: Likewise
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_proxy65/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
* src/odbc/Makefile.in: Likewise

SVN Revision: 775
 2007-05-29 14:31:12 +00:00
Alexey Shchepin
8aab10d28c * src/ejabberd_auth.erl: Added get_vh_registered_users_number/1 
function
* src/ejabberd_auth_odbc.erl: Likewise
* src/odbc/odbc_queries.erl: Added users_number/1 function
* src/ejabberd.cfg.example: Added an example for
pgsql_users_number_estimate option

SVN Revision: 766
 2007-05-12 18:09:38 +00:00
Mickaël Rémond
48c073abd2 * src/odbc/ejabberd_odbc.erl: ejabberd admin can now choose the 
relational database port to user from ejabberd configuration
file (EJAB-195).
* src/doc/guide.tex: Likewise.

SVN Revision: 740
 2007-03-10 15:53:53 +00:00
Mickaël Rémond
090ba85424 * src/odbc/pg.sql: last table, state column cannot be NULL (EJAB-191). 
* src/odbc/mysql.sql: likewise.
* src/odbc/mssql.sql. likewise.

SVN Revision: 732
 2007-02-19 14:19:27 +00:00
Mickaël Rémond
86da0b3e1b 2006-11-20 Mickael Remond <mickael.remond@process-one.net> 
* src/ejd2odbc.erl: Copy mod_private data from Mnesia to
relational database.  
* src/odbc/odbc_queries.erl: Refactoring.  
* src/odbc/mssql.sql: Likewise.
* doc/guide.tex: Update to mention mod_private_odbc.

* src/odbc/mysql.sql: Started integration of mod_privacy_odbc for
MySQL and MSSQL.
* src/odbc/mssql.sql: Likewise.

SVN Revision: 678
 2006-11-20 13:20:47 +00:00
Mickaël Rémond
37061880dc * src/odbc/mysql.sql: Fix database creation script. 
SVN Revision: 675
 2006-11-05 16:48:33 +00:00
Mickaël Rémond
d571a564d3 * src/mod_private_odbc.erl: Support for MySQL and MSSQL. 
* src/odbc/odbc_queries.erl: Likewise.
* src/odbc/mysql.sql: Likewise.
* src/odbc/mssql.sql: Likewise.

SVN Revision: 674
 2006-11-05 15:51:26 +00:00
Mickaël Rémond
65fcd921b5 * src/odbc/mysql: Database creation script should now be compliant with 
MySQL 4.0.x.

SVN Revision: 673
 2006-11-04 17:39:11 +00:00
Mickaël Rémond
97dd63eb7a * src/odbc/pg.sql: Database scripts consistency. 
* src/odbc/mysql.sql: Likewise.
* src/odbc/mssql.sql: Likewise.

SVN Revision: 672
 2006-11-04 16:38:05 +00:00
Alexey Shchepin
cd7595e3f4 * src/ejabberd_socket.erl: Added sockname/1 and peername/1 
functions
* src/ejabberd_frontend_socket.erl: Likewise
* src/tls/tls.erl: Likewise
* src/ejabberd_zlib/ejabberd_zlib.erl: Likewise

* src/mod_private_odbc.erl: Private storage support using odbc
* src/odbc/pg.sql: Likewise

SVN Revision: 663
 2006-10-19 04:46:24 +00:00
Alexey Shchepin
95e2726f71 * src/mod_privacy_odbc.erl: Privacy rules support using odbc 
* src/odbc/pg.sql: Likewise

* src/web/ejabberd_http_poll.erl: Bugfix

SVN Revision: 660
 2006-10-09 20:32:41 +00:00
Alexey Shchepin
fa7693d355 * src/mod_privacy.erl: Use hooks instead of direct function calls 
* src/ejabberd_c2s.erl: Updated

SVN Revision: 659
 2006-10-05 03:17:41 +00:00
Mickaël Rémond
6acc96c171 * src/odbc/mssql.sql: Removed unused fields. 
SVN Revision: 605
 2006-09-11 15:38:48 +00:00
Mickaël Rémond
d0e2ac9ed2 * src/odbc/odbc_queries.erl: Support for Microsoft SQL Server as 
a database backend (via ODBC).
* src/odbc/ejabberd_odbc.erl: Likewise.
* src/odbc/mssql.sql: Likewise.
* src/odbc/Makefile.in: Likewise.
* src/ejabberd_auth_odbc.erl: Likewise.
* src/mod_offline_odbc.erl: Likewise.
* src/mod_roster_odbc.erl: Likewise.
* src/mod_last_odbc.erl: Likewise.
* src/configure.ac: Likewise
* doc/guide.tex: Likewise.
* doc/introduction.tex: Likewise.
* src/odbc/pg.sql: Minor fix.

SVN Revision: 598
 2006-09-03 15:15:46 +00:00