Skip to content

Commit 8786614

Browse files
Ilia RostovtsevIlia Rostovtsev
Ilia Rostovtsev
authored and
Ilia Rostovtsev
committed
18.32 [patch #640]
1 parent 580d273 commit 8786614

40 files changed

+1364
-469
lines changed

‎authentic-init.pm

+252-64
Large diffs are not rendered by default.

‎authentic-lib.pm

+547-264
Large diffs are not rendered by default.

‎authentic.pm

+145-39
Large diffs are not rendered by default.

‎buttons.pm

+56-18
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,64 @@
66

77
our $user = $remote_user;
88

9-
if ( $__settings{'settings_sysinfo_link_mini'} ne 'false'
9+
if ( $__settings{'settings_sysinfo_link_mini'} eq 'true'
1010
&& dashboard_switch() ne '1' )
1111
{
12-
print '<li class="user-link">';
13-
print '<a class="menu-exclude-link sidebar_sysinfo_link" target="page" href="' . $gconfig{'webprefix'} . '/sysinfo.cgi"><i class="fa fa-fw fa-dashboard"></i></a>';
12+
print '<li'
13+
. get_hotkey_tooltip( 'settings_hotkey_sysinfo', 'settings_hotkey_sysinfo', 'auto top' )
14+
. ' class="user-link">';
15+
print '<a class="menu-exclude-link sidebar_sysinfo_link" target="page" href="'
16+
. $gconfig{'webprefix'}
17+
. '/sysinfo.cgi"><i class="fa fa-fw fa-dashboard"></i></a>';
1418
print '</li>';
1519
}
1620

21+
print '<li'
22+
. get_hotkey_tooltip( 'settings_hotkey_toggle_key_night_mode', 'settings_hotkey_toggle_key_night_mode', 'auto top' )
23+
. ' class="user-link palette-toggle cursor-pointer'
24+
. ( ($__settings{'settings_show_night_mode_link'} ne 'false' && $__settings{'settings_background_color'} ne "nightRider") ? '' : ' hidden' ) . '">';
25+
print '<span><i class="fa fa-fw '
26+
. ( theme_night_mode() ? 'fa-sun vertical-align-middle' : 'fa-moon' )
27+
. '"></i></span>';
28+
print '</li>';
29+
1730
if ( $__settings{'settings_show_terminal_link'} ne 'false'
1831
&& foreign_available("shell") )
1932
{
20-
print '<li class="user-link ported-console cursor-pointer">';
33+
print '<li'
34+
. get_hotkey_tooltip( 'settings_hotkey_shell', 'settings_hotkey_shell', 'auto top' )
35+
. ' class="user-link ported-console cursor-pointer">';
2136
print '<span><i class="fa fa-fw fa-terminal"></i></span>';
2237
print '</li>';
2338
}
2439

2540
if ( $get_user_level eq '0'
2641
&& foreign_available('webmin') )
2742
{
28-
print '<li class="user-link favorites cursor-pointer' . ( $__settings{'settings_favorites'} ne 'false' ? '' : ' hidden' ) . '">';
43+
print '<li'
44+
. get_hotkey_tooltip( 'settings_hotkey_favorites', 'settings_hotkey_favorites', 'auto top' )
45+
. ' class="user-link favorites cursor-pointer'
46+
. ( $__settings{'settings_favorites'} ne 'false' ? '' : ' hidden' ) . '">';
2947
print '<span><i class="fa fa-fw fa-star"></i></span>';
3048
print '</li>';
3149
}
3250

33-
if ( $__settings{'settings_theme_options_button'} ne 'false'
34-
&& $get_user_level eq '0'
35-
&& foreign_available('webmin') )
36-
{
51+
if ( $__settings{'settings_theme_options_button'} ne 'false' ) {
3752
print '<li class="user-link theme-options cursor-pointer">';
38-
print '<a class="menu-exclude-link" target="page" href="' . $gconfig{'webprefix'} . '/webmin/edit_themes.cgi" data-href="' . $gconfig{'webprefix'} . '/webmin/edit_themes.cgi"><i class="fa fa-fw fa-cogs"></i></a>';
53+
if ( $get_user_level eq '0' && foreign_available('webmin') ) {
54+
print '<a class="menu-exclude-link" target="page" href="'
55+
. $gconfig{'webprefix'}
56+
. '/webmin/edit_themes.cgi" data-href="'
57+
. $gconfig{'webprefix'}
58+
. '/webmin/edit_themes.cgi"><i class="fa fa-fw fa-cogs"></i></a>';
59+
}
60+
else {
61+
print '<a class="menu-exclude-link" target="page" href="'
62+
. $gconfig{'webprefix'}
63+
. '/settings-user.cgi" data-href="'
64+
. $gconfig{'webprefix'}
65+
. '/settings-user.cgi"><i class="fa fa-fw fa-cogs"></i></a>';
66+
}
3967
print '</li>';
4068
}
4169

@@ -46,13 +74,15 @@ if ( &foreign_available("acl") ) {
4674
. '/acl/edit_user.cgi" href="'
4775
. $gconfig{'webprefix'}
4876
. '/acl/edit_user.cgi?user='
49-
. $user
77+
. ( get_env('base_remote_user') eq "root" ? "root" : $user )
5078
. '"><i class="fa fa-fw fa-user"></i>&nbsp;<span>'
5179
. $user
5280
. '</span></a>';
5381
}
5482
else {
55-
print '<a class="menu-exclude-link" style="pointer-events: none;"><i class="fa fa-fw fa-user"></i>&nbsp;<span>' . $user . '</span></a>';
83+
print '<a class="menu-exclude-link" style="pointer-events: none;"><i class="fa fa-fw fa-user"></i>&nbsp;<span>'
84+
. $user
85+
. '</span></a>';
5686
}
5787
print '</li>';
5888

@@ -65,10 +95,14 @@ if ( $miniserv{'logout'}
6595
{
6696
print '<li class="user-link __logout-link">';
6797
if ($main::session_id) {
68-
print '<a class="menu-exclude-link" href="' . $gconfig{'webprefix'} . '/session_login.cgi?logout=1"><i class="fa fa-fw fa-sign-out text-danger"></i></a>';
98+
print '<a class="menu-exclude-link" href="'
99+
. $gconfig{'webprefix'}
100+
. '/session_login.cgi?logout=1"><i class="fa fa-fw fa-sign-out text-danger"></i></a>';
69101
}
70102
else {
71-
print '<a class="menu-exclude-link" href="' . $gconfig{'webprefix'} . '/switch_user.cgi"><i class="fa fa-fw fa-exchange text-danger"></i></a>';
103+
print '<a class="menu-exclude-link" href="'
104+
. $gconfig{'webprefix'}
105+
. '/switch_user.cgi"><i class="fa fa-fw fa-exchange text-danger"></i></a>';
72106
}
73107
print '</li>';
74108
}
@@ -89,11 +123,15 @@ if ( -r "$root_directory/virtual-server/edit_lang.cgi"
89123
elsif ( &foreign_available("change-user")
90124
&& $__settings{'settings_leftmenu_button_language'} eq 'true' )
91125
{
92-
print '<li class="user-link"><a class="menu-exclude-link" target="page" href="' . $gconfig{'webprefix'} . '/change-user"><i class="fa fa-fw fa-globe"></i></a></li>';
126+
print '<li class="user-link"><a class="menu-exclude-link" target="page" href="'
127+
. $gconfig{'webprefix'}
128+
. '/change-user"><i class="fa fa-fw fa-globe"></i></a></li>';
93129
}
94130

95-
if ( $__settings{'settings_leftmenu_button_refresh'} ne 'false' ) {
96-
print '<li class="user-link"><a class="menu-exclude-link" data-refresh="true" style="cursor: pointer"><i class="fa fa-fw fa-refresh"></i></a></li>';
97-
}
131+
print '<li'
132+
. get_hotkey_tooltip( 'settings_hotkey_reload', 'settings_hotkey_reload', 'auto top' )
133+
. ' class="user-link'
134+
. ( $__settings{'settings_leftmenu_button_refresh'} ne 'true' && ' hidden' )
135+
. '"><a class="menu-exclude-link" data-refresh="true" style="cursor: pointer"><i class="fa fa-fw fa-refresh"></i></a></li>';
98136

99137
1;

‎extensions/csf/csf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ function csf_init() {
400400
v.find(".csf p > select").each(function() {
401401
$(this).attr("style", "vertical-align: baseline !important")
402402
});
403-
var h = (typeof f.settings_background_color != "undef" && f.settings_background_color === "nightRider" ? 1 : 0);
403+
var h = ((f.__isNR || f.__isNM) ? 1 : 0);
404404
v.find('img[src="csfimages/loader.gif"]').each(function() {
405405
$(this).attr("src", "" + (with_frame ? f.$_____link_full : "") + "/images/loader-horizontal" + (h ? "_dark" : "") + ".gif").css("margin-left", "10px")
406406
});

‎extensions/csf/csf.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lang/ca.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/cz.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/da.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/de.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -647,3 +647,8 @@ theme_xhred_move_up=Move up
647647
theme_xhred_move_down=Move down
648648
theme_xhred_add_after=Add after
649649
theme_xhred_add_before=Add before
650+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
651+
settings_show_night_mode_link=Show palette toggle
652+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
653+
settings_title=Theme Configuration
654+
settings_subtitle=For user

‎lang/en.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -646,3 +646,8 @@ theme_xhred_move_up=Move up
646646
theme_xhred_move_down=Move down
647647
theme_xhred_add_after=Add after
648648
theme_xhred_add_before=Add before
649+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
650+
settings_show_night_mode_link=Show palette toggle
651+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
652+
settings_title=Theme Configuration
653+
settings_subtitle=For user

‎lang/es.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/fr.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/it.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/nl.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/no.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/pl.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/pt.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/ro_RO.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎lang/ru.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -651,3 +651,8 @@ theme_xhred_move_up=Move up
651651
theme_xhred_move_down=Move down
652652
theme_xhred_add_after=Add after
653653
theme_xhred_add_before=Add before
654+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
655+
settings_show_night_mode_link=Show palette toggle
656+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
657+
settings_title=Theme Configuration
658+
settings_subtitle=For user

‎lang/zh_CN.UTF-8

+5
Original file line numberDiff line numberDiff line change
@@ -648,3 +648,8 @@ theme_xhred_move_up=Move up
648648
theme_xhred_move_down=Move down
649649
theme_xhred_add_after=Add after
650650
theme_xhred_add_before=Add before
651+
settings_hotkeys_tooltip=Enable tooltip on correspondent buttons
652+
settings_show_night_mode_link=Show palette toggle
653+
settings_hotkey_toggle_key_night_mode=Hotkey for toggling dark/light palette
654+
settings_title=Theme Configuration
655+
settings_subtitle=For user

‎navigation.pm

+34-13
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,43 @@ if ( $t_uri_virtualmin == -1 && $t_uri_cloudmin == -1 && $t_uri_webmail == -1
2020
{
2121
print_search();
2222

23-
@cats = &get_visible_modules_categories();
24-
@modules = map { @{ $_->{'modules'} } } @cats;
25-
$show_unused = $__settings{'settings_leftmenu_section_hide_unused_modules'} eq 'true' ? 0 : 1;
23+
my @cats = &get_visible_modules_categories();
24+
my @modules = map { @{ $_->{'modules'} } } @cats;
25+
my $show_unused = $__settings{'settings_leftmenu_section_hide_unused_modules'} eq 'true' ? 0 : 1;
26+
my $__custom_print = 0;
2627

27-
foreach $c (@cats) {
28+
foreach my $c (@cats) {
2829
if ( $gconfig{"notabs_${base_remote_user}"} ne '2' && $gconfig{"notabs"} ne '1' && ( $c && !$c->{'unused'} )
2930
|| ( $c && $c->{'unused'} && $show_unused ) )
3031
{
3132
&print_category( $c->{'code'}, $c->{'desc'} );
3233
print '<li class="sub-wrapper"><ul class="sub" style="display: none;" id="' . $c->{'code'} . '">' . "\n";
3334
foreach my $minfo ( @{ $c->{'modules'} } ) {
34-
if ( $minfo->{'dir'} eq 'webmin'
35-
&& &foreign_available("webmin") )
35+
if ( ( $minfo->{'dir'} eq 'webmin' && &foreign_available("webmin") )
36+
&& $__custom_print eq '0' )
3637
{
37-
&print_category_link( $gconfig{'webprefix'} . "/webmin/edit_themes.cgi", $Atext{'settings_right_theme_left_configuration_title'}, 1 );
38-
&print_category_link( $gconfig{'webprefix'} . "/settings-editor_read.cgi", $Atext{'settings_right_theme_left_extensions_title'}, 1 );
39-
&print_category_link( $gconfig{'webprefix'} . "/settings-upload.cgi", $Atext{'settings_right_theme_left_logo_title'}, 1 );
38+
print_category_link( $gconfig{'webprefix'} . "/webmin/edit_themes.cgi",
39+
$Atext{'settings_right_theme_left_configuration_title'}, 1 );
40+
print_category_link( $gconfig{'webprefix'} . "/settings-editor_read.cgi",
41+
$Atext{'settings_right_theme_left_extensions_title'}, 1 );
42+
print_category_link( $gconfig{'webprefix'} . "/settings-upload.cgi",
43+
$Atext{'settings_right_theme_left_logo_title'}, 1 );
44+
$__custom_print++;
4045

4146
}
47+
elsif ( ( $c->{'code'} eq 'webmin' || $c->{'code'} eq 'usermin' ) && !foreign_available("webmin") && $__custom_print eq '0' ) {
48+
print_category_link( $gconfig{'webprefix'} . "/settings-user.cgi", $Atext{'settings_title'},
49+
undef );
50+
$__custom_print++;
51+
}
4252

4353
if ( licenses('vm') eq '1' ) {
44-
&print_category_link( $gconfig{'webprefix'} . "/virtual-server/licence.cgi", $Atext{'right_vlcheck'}, 1 );
54+
&print_category_link( $gconfig{'webprefix'} . "/virtual-server/licence.cgi",
55+
$Atext{'right_vlcheck'}, 1 );
4556
}
4657
if ( licenses('cm') eq '1' ) {
47-
&print_category_link( $gconfig{'webprefix'} . "/server-manager/licence.cgi", $Atext{'right_slcheck'}, 1 );
58+
&print_category_link( $gconfig{'webprefix'} . "/server-manager/licence.cgi",
59+
$Atext{'right_slcheck'}, 1 );
4860
}
4961

5062
if ( ( $minfo->{'dir'} ne 'virtual-server' && $minfo->{'dir'} ne 'server-manager' )
@@ -53,6 +65,7 @@ if ( $t_uri_virtualmin == -1 && $t_uri_cloudmin == -1 && $t_uri_webmail == -1
5365
{
5466
&print_category_link( "$minfo->{'dir'}/", $minfo->{'desc'}, undef );
5567
}
68+
5669
}
5770
print '</ul></li>' . "\n";
5871
}
@@ -81,10 +94,18 @@ if ( $t_uri_virtualmin == -1 && $t_uri_cloudmin == -1 && $t_uri_webmail == -1
8194
print_sysstat_link();
8295
print_netdata_link();
8396

84-
if ( &get_product_name() eq 'webmin' && !get_env('anonymous_user') && $gconfig{'nofeedbackcc'} != 2 && $gaccess{'feedback'} && $gconfig{'feedback_to'}
97+
if ( &get_product_name() eq 'webmin'
98+
&& !get_env('anonymous_user')
99+
&& $gconfig{'nofeedbackcc'} != 2
100+
&& $gaccess{'feedback'}
101+
&& $gconfig{'feedback_to'}
85102
|| &get_product_name() eq 'usermin' && !get_env('anonymous_user') && $gconfig{'feedback'} )
86103
{
87-
print '<li><a target="page" data-href="' . $gconfig{'webprefix'} . '/feedback_form.cgi" class="navigation_module_trigger"><i class="fa fa-fw fa-envelope"></i> <span>' . $Atext{'left_feedback'} . '</span></a></li>' . "\n";
104+
print '<li><a target="page" data-href="'
105+
. $gconfig{'webprefix'}
106+
. '/feedback_form.cgi" class="navigation_module_trigger"><i class="fa fa-fw fa-envelope"></i> <span>'
107+
. $Atext{'left_feedback'}
108+
. '</span></a></li>' . "\n";
88109
}
89110
}
90111

0 commit comments

Comments
 (0)