Use improved WebAdmin menu system in more modules

Author: badlop

src/ejabberd_captcha.erl

@@ -482,10 +482,10 @@ get_url(Str) ->
     end.
 
 get_url() ->
-    case ejabberd_http:get_auto_url(any, ?MODULE) of
-        undefined ->
+    case ejabberd_http:get_auto_urls(any, ?MODULE) of
+        [] ->
             undefined;
-        Url ->
+        [{_ThisTls, Url} | _] ->
             Host = ejabberd_config:get_myname(),
             misc:expand_keyword(<<"@HOST@">>, Url, Host)
     end.

src/ejabberd_oauth.erl

@@ -55,6 +55,7 @@
          oauth_remove_client/1]).
 
 -export([web_menu_main/2, web_page_main/2]).
+-export([web_menu_system/3]).
 
 -include_lib("xmpp/include/xmpp.hrl").
 -include("logger.hrl").
@@ -234,6 +235,7 @@ init([]) ->
     ejabberd_commands:register_commands(get_commands_spec()),
     ejabberd_hooks:add(webadmin_menu_main, ?MODULE, web_menu_main, 50),
     ejabberd_hooks:add(webadmin_page_main, ?MODULE, web_page_main, 50),
+    ejabberd_hooks:add(webadmin_menu_system_post, ?MODULE, web_menu_system, 889),
     ejabberd_hooks:add(config_reloaded, ?MODULE, config_reloaded, 50),
     erlang:send_after(expire(), self(), clean),
     {ok, ok}.
@@ -261,6 +263,7 @@ handle_info(Info, State) ->
 terminate(_Reason, _State) ->
     ejabberd_hooks:delete(webadmin_menu_main, ?MODULE, web_menu_main, 50),
     ejabberd_hooks:delete(webadmin_page_main, ?MODULE, web_page_main, 50),
+    ejabberd_hooks:delete(webadmin_menu_system_post, ?MODULE, web_menu_system, 889),
     ejabberd_hooks:delete(config_reloaded, ?MODULE, config_reloaded, 50).
 
 code_change(_OldVsn, State, _Extra) -> {ok, State}.
@@ -842,3 +845,7 @@ web_page_main(_, #request{path = [<<"oauth">>]} = R) ->
     {stop, Head ++ Set};
 web_page_main(Acc, _) ->
     Acc.
+
+web_menu_system(Result, _Request, _Level) ->
+    Els = ejabberd_web_admin:make_menu_system(?MODULE, "⚫", "OAuth", "authorization_token"),
+    Els ++ Result.

src/mod_conversejs.erl

@@ -43,7 +43,7 @@
 
 start(_Host, _Opts) ->
     {ok, [{hook, http_request_handlers_init, http_handlers_init, 50, global},
-          {hook, webadmin_menu_system_post, web_menu_system, 50, global}]}.
+          {hook, webadmin_menu_system_post, web_menu_system, 1000-$c, global}]}.
 
 stop(_Host) ->
     ok.
@@ -281,15 +281,22 @@ http_handlers_init(Handlers, _Opts) ->
                     Handlers),
     lists:reverse(Handlers2).
 
-web_menu_system(Result, _Request, Level) ->
+web_menu_system(Result, #request{tp = Protocol}, Level) ->
+    Els = ejabberd_web_admin:make_menu_system(?MODULE, "☯️", "Converse", ""),
     Base = iolist_to_binary(lists:duplicate(Level, "../")),
-    ConverseEl =
-        ?LI([?C(unicode:characters_to_binary("☯️")),
-             ?XAE(<<"a">>,
-                  [{<<"href">>, <<Base/binary, ?AUTOLOGIN_PATH/binary>>},
-                   {<<"target">>, <<"_blank">>}],
-                  [?C(unicode:characters_to_binary("Converse"))])]),
-    [ConverseEl | Result].
+    ThisTls =
+        case Protocol of
+            http ->
+                false;
+            https ->
+                true
+        end,
+    ConverseEl2 =
+        ejabberd_web_admin:make_menu_system_el("☯️",
+                                               "Converse (autologin)",
+                                               binary_to_list(?AUTOLOGIN_PATH),
+                                               {ThisTls, Base}),
+    lists:flatten([ConverseEl2, Els, Result]).
 %% @format-end
 
 %%----------------------------------------------------------------------

src/mod_http_fileserver.erl

@@ -45,8 +45,12 @@
 
 -export([reopen_log/0, mod_opt_type/1, mod_options/1, depends/2, mod_doc/0]).
 
+-export([web_menu_system/3]).
+
+-include_lib("xmpp/include/xmpp.hrl").
 -include("logger.hrl").
 -include("ejabberd_http.hrl").
+-include("ejabberd_web_admin.hrl").
 -include_lib("kernel/include/file.hrl").
 -include("translate.hrl").
 
@@ -89,9 +93,11 @@
 %%====================================================================
 
 start(Host, Opts) ->
+    ejabberd_hooks:add(webadmin_menu_system_post, global, ?MODULE, web_menu_system, 896),
     gen_mod:start_child(?MODULE, Host, Opts).
 
 stop(Host) ->
+    ejabberd_hooks:delete(webadmin_menu_system_post, global, ?MODULE, web_menu_system, 896),
     gen_mod:stop_child(?MODULE, Host).
 
 reload(Host, NewOpts, OldOpts) ->
@@ -473,6 +479,16 @@ ip_to_string(Address) when size(Address) == 8 ->
     Parts = lists:map(fun (Int) -> io_lib:format("~.16B", [Int]) end, tuple_to_list(Address)),
     string:to_lower(lists:flatten(join(Parts, ":"))).
 
+%%----------------------------------------------------------------------
+%% WebAdmin
+%%----------------------------------------------------------------------
+
+web_menu_system(Result, _Request, _Level) ->
+    Els = ejabberd_web_admin:make_menu_system(?MODULE, "📁", "HTTP Fileserver", ""),
+    Els ++ Result.
+
+%%----------------------------------------------------------------------
+
 mod_opt_type(accesslog) ->
     econf:file(write);
 mod_opt_type(content_types) ->

src/mod_register_web.erl

@@ -31,6 +31,7 @@
 
 -export([start/2, stop/1, reload/3, process/2, mod_options/1, depends/2]).
 -export([mod_doc/0]).
+-export([web_menu_system/3]).
 
 -include("logger.hrl").
 
@@ -48,7 +49,7 @@
 
 start(_Host, _Opts) ->
     %% case mod_register_web_opt:docroot(Opts, fun(A) -> A end, undefined) of
-    ok.
+    {ok, [{hook, webadmin_menu_system_post, web_menu_system, 1000-$r, global}]}.
 
 stop(_Host) -> ok.
 
@@ -606,6 +607,18 @@ get_error_text({error, wrong_parameters}) ->
 get_error_text({error, Why}) ->
     mod_register:format_error(Why).
 
+%%----------------------------------------------------------------------
+%% WebAdmin
+%%----------------------------------------------------------------------
+
+web_menu_system(Result, _Request, _Level) ->
+    Els = ejabberd_web_admin:make_menu_system(?MODULE, "🪪", "Register Web", ""),
+    Els ++ Result.
+
+%%----------------------------------------------------------------------
+%%
+%%----------------------------------------------------------------------
+
 mod_options(_) ->
     [].