Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Small relax the limitation in the mod_pubsub_odbc host option.

Browse Source 
SVN Revision: 2780
This commit is contained in:
Badlop 2009-12-04 16:07:43 +00:00
parent 2c1b8b0930
commit c3df4f3eb0
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/guide.html
View File

@ -2717,7 +2717,8 @@ service. If the <TT>host</TT> option is not specified, the Jabber ID will be the
hostname of the virtual host with the prefix &#X2018;<TT>pubsub.</TT>&#X2019;. The keyword "@HOST@" hostname of the virtual host with the prefix &#X2018;<TT>pubsub.</TT>&#X2019;. The keyword "@HOST@"
is replaced at start time with the real virtual host name. is replaced at start time with the real virtual host name.
If you use <TT>mod_pubsub_odbc</TT>, you can only use the prefix &#X2018;<TT>pubsub.</TT>&#X2019;. If you use <TT>mod_pubsub_odbc</TT>, please ensure the prefix contains only one dot,
for example &#X2018;<TT>pubsub.</TT>&#X2019;, or &#X2018;<TT>publish.</TT>&#X2019;,.
</DD><DT CLASS="dt-description"><B><TT>{access_createnode, AccessName}</TT></B></DT><DD CLASS="dd-description"> </DD><DT CLASS="dt-description"><B><TT>{access_createnode, AccessName}</TT></B></DT><DD CLASS="dd-description">
This option restricts which users are allowed to create pubsub nodes using This option restricts which users are allowed to create pubsub nodes using
ACL and ACCESS. ACL and ACCESS.

3
doc/guide.tex
View File

@ -3479,7 +3479,8 @@ and it requires \modcaps{}.
Options: Options:
\begin{description} \begin{description}
\hostitem{pubsub} \hostitem{pubsub}
If you use \modpubsubodbc, you can only use the prefix `\jid{pubsub.}'. If you use \modpubsubodbc, please ensure the prefix contains only one dot,
for example `\jid{pubsub.}', or `\jid{publish.}',.
\titem{\{access\_createnode, AccessName\}} \ind{options!access\_createnode} \titem{\{access\_createnode, AccessName\}} \ind{options!access\_createnode}
This option restricts which users are allowed to create pubsub nodes using This option restricts which users are allowed to create pubsub nodes using
ACL and ACCESS. ACL and ACCESS.

2
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -3630,7 +3630,7 @@ transaction_retry(Host, Fun, Trans, Count) ->
odbc_conn({_U, Host, _R})-> odbc_conn({_U, Host, _R})->
Host; Host;
odbc_conn(Host) -> odbc_conn(Host) ->
Host--"pubsub.". %% TODO, improve that for custom host lists:dropwhile(fun(A) -> A/=$. end, Host) -- ".".
%% escape value for database storage %% escape value for database storage
escape({_U, _H, _R}=JID)-> escape({_U, _H, _R}=JID)->

2
src/mod_pubsub/pubsub_odbc.patch
View File

@ -812,7 +812,7 @@
+odbc_conn({_U, Host, _R})-> +odbc_conn({_U, Host, _R})->
+ Host; + Host;
+odbc_conn(Host) -> +odbc_conn(Host) ->
+ Host--"pubsub.". %% TODO, improve that for custom host + lists:dropwhile(fun(A) -> A/=$. end, Host) -- ".".
+ +
+%% escape value for database storage +%% escape value for database storage
+escape({_U, _H, _R}=JID)-> +escape({_U, _H, _R}=JID)->