From 007debeeeea069bffde079a3ea15f49ca39992aa Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Tue, 2 Oct 2018 22:50:14 +0300 Subject: [PATCH] Add ability to control number of shown virtual servers on Dashboard #1200 --- authentic-lib.pm | 12 ++++++++---- lang/ca.UTF-8 | 3 +++ lang/cz.UTF-8 | 3 +++ lang/da.UTF-8 | 3 +++ lang/de.UTF-8 | 3 +++ lang/en.UTF-8 | 3 +++ lang/es.UTF-8 | 3 +++ lang/fr.UTF-8 | 3 +++ lang/id.UTF-8 | 3 +++ lang/it.UTF-8 | 3 +++ lang/ja_JP.UTF-8 | 3 +++ lang/nl.UTF-8 | 3 +++ lang/no.UTF-8 | 3 +++ lang/pl.UTF-8 | 3 +++ lang/pt.UTF-8 | 3 +++ lang/ro_RO.UTF-8 | 3 +++ lang/ru.UTF-8 | 3 +++ lang/sq.UTF-8 | 3 +++ lang/sv.UTF-8 | 3 +++ lang/zh_CN.UTF-8 | 3 +++ sysinfo.cgi | 2 +- 21 files changed, 66 insertions(+), 5 deletions(-) diff --git a/authentic-lib.pm b/authentic-lib.pm index 6fe87ad68..6738394f4 100644 --- a/authentic-lib.pm +++ b/authentic-lib.pm @@ -2136,6 +2136,8 @@ sub theme_settings '8', 'settings_sysinfo_expand_all_accordions', 'false', + 'settings_sysinfo_max_servers', + '10', '__', theme_settings('fa', 'bars', &theme_text('settings_right_navigation_menu_title')), @@ -2282,8 +2284,8 @@ sub theme_settings } # Exclude list of settings for Virtualmin - my @s_vm_e = - ('settings_right_virtualmin_default', 'settings_show_webmin_tab', 'settings_hotkey_toggle_key_virtualmin'); + my @s_vm_e = ('settings_right_virtualmin_default', 'settings_show_webmin_tab', + 'settings_hotkey_toggle_key_virtualmin', 'settings_sysinfo_max_servers'); if (!foreign_available("virtual-server")) { foreach my $e (@s_vm_e) { @@ -2434,7 +2436,8 @@ sub theme_settings $k eq 'settings_sysinfo_real_time_timeout' || $k eq 'settings_sysinfo_easypie_charts_size' || $k eq 'settings_sysinfo_easypie_charts_width' || - $k eq 'settings_sysinfo_easypie_charts_scale') + $k eq 'settings_sysinfo_easypie_charts_scale' || + $k eq 'settings_sysinfo_max_servers') { my $width = @@ -2446,7 +2449,8 @@ sub theme_settings $k eq 'settings_hotkey_sysinfo' || $k eq 'settings_hotkey_favorites' || $k eq 'settings_sysinfo_easypie_charts_width' || - $k eq 'settings_sysinfo_easypie_charts_scale') ? ' width: 36px; ' : + $k eq 'settings_sysinfo_easypie_charts_scale' || + $k eq 'settings_sysinfo_max_servers') ? ' width: 36px; ' : ( ($k eq 'settings_sysinfo_real_time_timeout' || $k eq 'settings_sysinfo_easypie_charts_size') ? ' width: 50px; ' : ' width: 95%; '); diff --git a/lang/ca.UTF-8 b/lang/ca.UTF-8 index 1cafa5122..3188aa6c0 100644 --- a/lang/ca.UTF-8 +++ b/lang/ca.UTF-8 @@ -954,3 +954,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/cz.UTF-8 b/lang/cz.UTF-8 index a66d80011..20adf8e25 100644 --- a/lang/cz.UTF-8 +++ b/lang/cz.UTF-8 @@ -953,3 +953,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/da.UTF-8 b/lang/da.UTF-8 index dbe17d3b7..4417f2e26 100644 --- a/lang/da.UTF-8 +++ b/lang/da.UTF-8 @@ -954,3 +954,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/de.UTF-8 b/lang/de.UTF-8 index 2e2368c7d..8ab224f16 100644 --- a/lang/de.UTF-8 +++ b/lang/de.UTF-8 @@ -945,3 +945,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/en.UTF-8 b/lang/en.UTF-8 index 8a53567dd..882e3efaf 100644 --- a/lang/en.UTF-8 +++ b/lang/en.UTF-8 @@ -954,3 +954,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/es.UTF-8 b/lang/es.UTF-8 index 2e541edf8..70bd01175 100644 --- a/lang/es.UTF-8 +++ b/lang/es.UTF-8 @@ -954,3 +954,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/fr.UTF-8 b/lang/fr.UTF-8 index c765eb858..666e9a397 100644 --- a/lang/fr.UTF-8 +++ b/lang/fr.UTF-8 @@ -954,3 +954,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/id.UTF-8 b/lang/id.UTF-8 index f728b6dae..b2abc242d 100644 --- a/lang/id.UTF-8 +++ b/lang/id.UTF-8 @@ -956,3 +956,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/it.UTF-8 b/lang/it.UTF-8 index c16c06bc4..9c8419872 100644 --- a/lang/it.UTF-8 +++ b/lang/it.UTF-8 @@ -954,3 +954,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/ja_JP.UTF-8 b/lang/ja_JP.UTF-8 index 14953112b..5989205cd 100644 --- a/lang/ja_JP.UTF-8 +++ b/lang/ja_JP.UTF-8 @@ -951,3 +951,6 @@ theme_xhred_find_in_config_files= 設定ファイルで検索 theme_xhred_find_in_config_files_result_found_single= $2のファイルに$3の結果が見つかりました theme_xhred_find_in_config_files_result_found_multi= $2のファイルに$3の検索結果が見つかりました theme_xhred_find_in_config_files_results_found= $2のファイルに$3の検索結果が見つかりました + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/nl.UTF-8 b/lang/nl.UTF-8 index 87dff6c14..56bed1262 100644 --- a/lang/nl.UTF-8 +++ b/lang/nl.UTF-8 @@ -954,3 +954,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/no.UTF-8 b/lang/no.UTF-8 index d3fed9c9f..0d8703ba3 100644 --- a/lang/no.UTF-8 +++ b/lang/no.UTF-8 @@ -812,3 +812,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/pl.UTF-8 b/lang/pl.UTF-8 index 486aff19a..27847b497 100644 --- a/lang/pl.UTF-8 +++ b/lang/pl.UTF-8 @@ -954,3 +954,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/pt.UTF-8 b/lang/pt.UTF-8 index ba16d29e4..503b69e44 100644 --- a/lang/pt.UTF-8 +++ b/lang/pt.UTF-8 @@ -954,3 +954,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/ro_RO.UTF-8 b/lang/ro_RO.UTF-8 index ce29d5a19..4534b72b5 100644 --- a/lang/ro_RO.UTF-8 +++ b/lang/ro_RO.UTF-8 @@ -952,3 +952,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/ru.UTF-8 b/lang/ru.UTF-8 index 150bb8ebb..71dba27da 100644 --- a/lang/ru.UTF-8 +++ b/lang/ru.UTF-8 @@ -957,3 +957,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/sq.UTF-8 b/lang/sq.UTF-8 index fce2a7c57..8873788ba 100644 --- a/lang/sq.UTF-8 +++ b/lang/sq.UTF-8 @@ -965,3 +965,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/sv.UTF-8 b/lang/sv.UTF-8 index 46d542d6f..f9bbe1d15 100644 --- a/lang/sv.UTF-8 +++ b/lang/sv.UTF-8 @@ -951,3 +951,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/lang/zh_CN.UTF-8 b/lang/zh_CN.UTF-8 index 930d79818..b71713796 100644 --- a/lang/zh_CN.UTF-8 +++ b/lang/zh_CN.UTF-8 @@ -951,3 +951,6 @@ theme_xhred_find_in_config_files=Find in config files theme_xhred_find_in_config_files_result_found_single=$1 result found in $2 file for $3 theme_xhred_find_in_config_files_result_found_multi=$1 results found in $2 file for $3 theme_xhred_find_in_config_files_results_found=$1 results found in $2 files for $3 + +theme_xhred_filemanager_context_symlink=Create new symbolic link +settings_sysinfo_max_servers=Maximum virtual servers to show diff --git a/sysinfo.cgi b/sysinfo.cgi index 366e03406..70a0c4f95 100755 --- a/sysinfo.cgi +++ b/sysinfo.cgi @@ -55,7 +55,7 @@ if ($get_user_level ne '4' && &foreign_available("system-status") } # Get system info to show -my @info = &list_combined_system_info({ 'qshow', 1 }); +my @info = &list_combined_system_info({ 'qshow', 1, 'max' => $theme_config{'settings_sysinfo_max_servers'} }); if ($get_user_level eq '0' || $get_user_level eq '4') {