* src/mod_configure.erl: Update calls from ctl to

commands (EJAB-694)
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 1640

diff --git a/ChangeLog b/ChangeLog
index 04cac4db01bc212629fca7039ca1514e826d6bc8..f2574e668e6ebeb82a32ce4a3989a809b496c858 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-10-12  Badlop  <badlop@process-one.net>
 
+       * src/mod_configure.erl: Update calls from ctl to
+       commands (EJAB-694)
+       * src/web/ejabberd_web_admin.erl: Likewise
+
        * src/ejabberd_sm.erl: Update from ctl to commands (EJAB-694)
        * src/ejabberd_s2s.erl: Likewise
 

diff --git a/src/mod_configure.erl b/src/mod_configure.erl
index 34938fab92ae1227c4e522bdceca57f2226fa6cd..611c6e74e798a5ff420f3b990da0df1fc9a41af3 100644 (file)
--- a/src/mod_configure.erl
+++ b/src/mod_configure.erl
@@ -1416,7 +1416,7 @@ set_form(_From, _Host, ["running nodes", ENode, "backup", "textfile"], _Lang, XD
                false ->
                    {error, ?ERR_BAD_REQUEST};
                {value, {_, [String]}} ->
-                   case rpc:call(Node, ejabberd_ctl, dump_to_textfile, [String]) of
+                   case rpc:call(Node, ejabberd_admin, dump_to_textfile, [String]) of
                        {badrpc, _Reason} ->
                            {error, ?ERR_INTERNAL_SERVER_ERROR};
                        {error, _Reason} ->

diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl
index 9497efeb9b23279e0764c4561badba1aa5fe8abd..cd97edb65110f246ab01835eb1da14ee99907e5e 100644 (file)
--- a/src/web/ejabberd_web_admin.erl
+++ b/src/web/ejabberd_web_admin.erl
@@ -2022,7 +2022,7 @@ node_backup_parse_query(Node, Query) ->
                                          rpc:call(Node, mnesia,
                                                   install_fallback, [Path]);
                                      "dump" ->
-                                         rpc:call(Node, ejabberd_ctl,
+                                         rpc:call(Node, ejabberd_admin,
                                                   dump_to_textfile, [Path]);
                                      "load" ->
                                          rpc:call(Node, mnesia,
@@ -2087,7 +2087,7 @@ node_ports_to_xhtml(Ports, Lang) ->
 
 node_ports_parse_query(Node, Ports, Query) ->
     lists:foreach(
-      fun({Port, _Module1, _Opts1}) ->
+      fun({Port, Module1, _Opts1}) ->
              SPort = integer_to_list(Port),
              case lists:keysearch("add" ++ SPort, 1, Query) of
                  {value, _} ->
@@ -2097,13 +2097,13 @@ node_ports_parse_query(Node, Ports, Query) ->
                      Module = list_to_atom(SModule),
                      {ok, Tokens, _} = erl_scan:string(SOpts ++ "."),
                      {ok, Opts} = erl_parse:parse_term(Tokens),
-                     rpc:call(Node, ejabberd_listener, delete_listener, [Port]),
+                     rpc:call(Node, ejabberd_listener, delete_listener, [Port, Module]),
                      rpc:call(Node, ejabberd_listener, add_listener, [Port, Module, Opts]),
                      throw(submitted);
                  _ ->
                      case lists:keysearch("delete" ++ SPort, 1, Query) of
                          {value, _} ->
-                             rpc:call(Node, ejabberd_listener, delete_listener, [Port]),
+                             rpc:call(Node, ejabberd_listener, delete_listener, [Port, Module1]),
                              throw(submitted);
                          _ ->
                              ok