New major version bump

https://forum.virtualmin.com/t/virtualmin-fail2ban-firewalld-ubuntu-20-04-not-working-already-banned-until-restart/116565/4?u=ilia

CHANGELOG.md

@@ -1,12 +1,41 @@
 ## Changelog
 
+#### 1.999 (August 4, 2022)
+* Fix to allow IPv6 addresses for slaves in BIND module
+* Fix to send `HUP` signal on reload with `systemd`
+* Fix icons in Servers Index module for newer distros (Alma and Rocky)
+* Fix to remove depricated option `UsePrivilegeSeparation` with OpenSSH 7.5+
+* Fix Oracle Linux support
+* Fix Ubuntu release notes links
+* Add Webmin release note message
+* Add latest Authentic [theme update](https://github.com/webmin/authentic-theme/releases/tag/19.99) with number of bug fixes
+
+#### 1.998 (July 25, 2022)
+* Fix Apache, BIND, MySQL, ProFTPd and other modules configs on newest distros for new installs
+* Fix to use Cron default path when run from UI
+* Fix post uninstall cleanups
+* Fix version detection bug for Log File Rotation module
+* Add improvements to Partitions on Local Disks module
+* Add better support for CentOS Stream Linux for new installs
+* Add improvements for searching and naming global PHP configs files
+* Add support for unix extensions option for Samba module https://github.com/webmin/webmin/issues/1695
+* Add latest Authentic [theme update](https://github.com/webmin/authentic-theme/releases/tag/19.98) with various bug fixes and small improvements
+
+#### 1.997 (July 12, 2022)
+* Add support for mirror and RAID volumes in LVM module
+* Add latest Authentic [theme update](https://github.com/webmin/authentic-theme/releases/tag/19.97) with nice new features in File Manager and other fixes
+* Fix more issues with restart when Webmin is upgraded from UI
+
+#### 1.996 (July 4, 2022)
+* Fix issues with `systemd` restarting Webmin on upgrade found in 1.995
+
 #### 1.995 (June 23, 2022)
   * Add improvements to stability for `systemd` systems
   * Add native support to default to system default hashing format
   * Add support to `yescrypt` password hashing scheme
   * Add new _System Logs Viewer_ (logviewer) module
   * Add new `webmin server` sub-command
-  * Add to set enviromental variables in Filesystem Backup module
+  * Add to set environmental variables in Filesystem Backup module
   * Fix upload tracker issues with large uploads
   * Fix NVMe drives status support
   * Fix AlmaLinux support

README-zh.md

@@ -0,0 +1,53 @@
+## 内容
+* [更新日志](https://github.com/webmin/webmin/blob/master/CHANGELOG.md)
+* [关于](#关于)
+* [安装](#安装)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-stable.png?raw=true" title="稳定版">](http://webmin.com/download.html)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-devel.png?raw=true" title="Development Versions">](http://webmin.com/devel.html)
+* [文档](#文档)
+* [致谢](#致谢)
+* [许可](#许可)
+
+## 关于
+
+**Webmin** 是一个基于网页的类Unix服务器系统管理工具，全球安装超过 _1,000,000_ 次（没错，事宝藏！）。有了它，运维快人一步！比如用户，磁盘配额，服务或者配置文件，比如更改，控制开源应用，再比如 BIND DNS Server，管理 Apache HTTP Server， PHP， MySQL， 还有[许多许多好东西](https://doxfer.webmin.com/Webmin/Introduction)。
+
+[![Quick UI overview 2021](https://user-images.githubusercontent.com/4426533/114315375-61a1c480-9b07-11eb-9aaf-4aa949a39ab7.png)](https://www.youtube.com/watch?v=daYG6O4AsEw)
+
+可通过安装可定制的模块来扩展可用性。 除此之外，还有另外两个扩展其功能的项目：
+
+* [Virtualmin](https://www.virtualmin.com) 是一个强大的，灵活的，最受欢迎的，最全面的 Linux 和 BSD 系统网络托管控制面板，在全球拥有超过 _150,000次_ 安装。它有开源社区支持的版本，以及功能更丰富的Premium版本；
+* [Usermin](https://github.com/webmin/usermin) 顾名思义，呈现和控制以用户为中心的功能子集，而不是管理员级别的任务。
+
+Webmin 包括 _116_ 个[标准模块](https://doxfer.webmin.com/Webmin/Webmin_Modules)，并且至少有同样多的第三方模块。
+
+
+### 系统要求
+Perl 5.10 或更高。
+
+## 安装
+Webmin 可以两种方法安装：
+
+ 1. 下载一个预编译包，可用于不同的发行版（CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris 和 [其他发行版](http://www.webmin.com/support.html)）。[下载页面直达车](http://webmin.com/download.html);
+  <kbd>注：非常建议[在你的系统添加源](https://doxfer.webmin.com/Webmin/Installation)，这样可以自动更新</kbd>
+
+ 2. 下载并解压[源码](https://prdownloads.sourceforge.net/webadmin/webmin-1.996.tar.gz)然后运行[_setup.sh_](http://www.webmin.com/tgz.html) 脚本，无需任何选项，也就是说会直接安装到当前目录。或者使用命令行参数，例如目标目录。
+  <kbd>注：如果你正在安装 Webmin [到Windows](http://www.webmin.com/windows.html) 系统上，你必须运行 `perl setup.pl` 命令。Windows 版能否正常运行取决于许多程序，和可能不属于标准发行版的模块。你需要 _process.exe_ 命令， _sc.exe_ 命令，以及 _Win32::Daemon_ Perl 模块。</kbd>
+
+## 文档
+完整的 Webmin 还有它所有模块的详细配置都在[维基页面](https://doxfer.webmin.com/Webmin/Main_Page).
+
+## 致谢
+
+### 首席开发者
+
+* [Jamie Cameron](http://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
+
+### 贡献者
+
+* [Joe Cooper](https://github.com/swelljoe)
+* [Ilia Rostovtsev](https://github.com/iliajie)
+* [Kay Marquardt](https://github.com/gnadelwartz)
+* [Nawawi Jamili](https://github.com/nawawi) + [其他无偿奉献的开发者](https://github.com/webmin/webmin/graphs/contributors)
+
+## 许可
+
+Webmin 基于 [BSD 许可](https://github.com/webmin/webmin/blob/master/LICENCE)发布。

README.md

@@ -6,6 +6,8 @@
 * [Development](#development)
 * [License](#license)
 
+* [中文版](https://github.com/webmin/webmin/blob/master/README-zh.md)
+
 ## About
 
 **Webmin** is a web-based system administration tool for Unix-like servers, and services with over _1,000,000_ installations worldwide. Using it, it is possible to configure operating system internals, such as users, disk quotas, services or configuration files, as well as modify, and control open-source apps, such as BIND DNS Server, Apache HTTP Server, PHP, MySQL, and [many more](https://doxfer.webmin.com/Webmin/Introduction). 
@@ -26,11 +28,11 @@ Perl 5.10 or higher.
 ## Installation
 Webmin can be installed in two different ways:
 
- 1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](http://www.webmin.com/support.html)) from our [download page](http://webmin.com/download.html);
+ 1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](http://www.webmin.com/support.html)) under [latest release assets](https://github.com/webmin/webmin/releases/latest) or from our [download page](http://webmin.com/download.html);
   <kbd>Note: It is highly recommended to [add repository](https://doxfer.webmin.com/Webmin/Installation) to your system for having automatic updates.</kbd>
 
- 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.995.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
-  <kbd>Note: If you are installing Webmin [on Windows](http://www.webmin.com/windows.html) system, you must run the command `perl setup.pl` instead. The Windows version depends on several programs, and modules that may not be part of the standard distribution. You will need _process.exe_ commmand, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>
+ 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-2.000.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
+  <kbd>Note: If you are installing Webmin [on Windows](http://www.webmin.com/windows.html) system, you must run the command `perl setup.pl` instead. The Windows version depends on several programs, and modules that may not be part of the standard distribution. You will need _process.exe_ command, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>
 
 ## Documentation
 Complete set of documentation for Webmin and all of its modules can be found at out [Wiki page](https://doxfer.webmin.com/Webmin/Main_Page).
@@ -41,12 +43,14 @@ Complete set of documentation for Webmin and all of its modules can be found at
 
 * [Jamie Cameron](http://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
 
-### Contributors
-
-* [Joe Cooper](https://github.com/swelljoe)
+### Developers
 * [Ilia Rostovtsev](https://github.com/iliajie)
+* [Joe Cooper](https://github.com/swelljoe)
+
+### Contributors
 * [Kay Marquardt](https://github.com/gnadelwartz)
-* [Nawawi Jamili](https://github.com/nawawi) + [57 more..](https://github.com/webmin/webmin/graphs/contributors)
+* [Nawawi Jamili](https://github.com/nawawi)
+* [unknown10777](https://github.com/unknown10777) + [90 more..](https://github.com/webmin/webmin/graphs/contributors)
 
 ## License
 

WebminUI/LinkTable.pm

@@ -145,7 +145,7 @@ $self->{'name'} = $name;
 }
 
 =head2 get_name()
-Returns the name for indentifying this table in HTML
+Returns the name for identifying this table in HTML
 =cut
 sub get_name
 {

WebminUI/Table.pm

@@ -402,7 +402,7 @@ $self->{'name'} = $name;
 }
 
 =head2 get_name()
-Returns the name for indentifying this table in HTML
+Returns the name for identifying this table in HTML
 =cut
 sub get_name
 {
@@ -628,7 +628,7 @@ else {
 
 =head2 make_url(sortcol, sortdir, paging, page, [no-searchargs], [no-pagearg])
 Returns a link to this table's page, with the defaults for the various state
-fields overriden by the parameters (where defined)
+fields overridden by the parameters (where defined)
 =cut
 sub make_url
 {

acl/acl-lib.pl

@@ -15,6 +15,7 @@ BEGIN { push(@INC, ".."); };
 use strict;
 use warnings;
 no warnings 'redefine';
+no warnings 'uninitialized';
 use WebminCore;
 &init_config();
 do 'md5-lib.pl';

acl/acl_security.pl

@@ -1,6 +1,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 do 'acl-lib.pl';
 our (%text, %in);
 

acl/backup_config.pl

@@ -1,6 +1,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require 'acl-lib.pl';
 our ($config_directory, %gconfig);
 

acl/cert_form.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 &ui_print_header(undef, $text{'cert_title'}, "", undef, undef, undef, undef,

acl/cert_issue.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $module_config_directory, $base_remote_user);
 &ReadParse();

acl/cert_output.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 

acl/cgi_args.pl

@@ -1,6 +1,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 do 'acl-lib.pl';
 our (%access);
 

acl/convert.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $config_directory);
 &ReadParse();

acl/convert_form.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 $access{'sync'} && $access{'create'} || &error($text{'convert_ecannot'});

acl/delete_group.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $base_remote_user);
 &ReadParse();

acl/delete_groups.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $base_remote_user);
 &ReadParse();

acl/delete_session.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, %sessiondb);
 &ReadParse();

acl/delete_user.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $base_remote_user);
 &ReadParse();

acl/delete_users.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $base_remote_user);
 &ReadParse();

acl/edit_acl.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $base_remote_user, %gconfig);
 &ReadParse();

acl/edit_group.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $config_directory);
 &ReadParse();

acl/edit_pass.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'pass_ecannot'});

acl/edit_rbac.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %gconfig, %access, $module_name, $module_root_directory);
 $access{'rbacenable'} || &error($text{'rbac_ecannot'});

acl/edit_sql.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 $access{'sql'} || &error($text{'sql_ecannot'});

acl/edit_sync.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 $access{'sync'} && $access{'create'} && $access{'delete'} ||

acl/edit_unix.cgi

@@ -5,6 +5,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 $access{'unix'} && $access{'create'} && $access{'delete'} ||

acl/edit_user.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $config_directory, $base_remote_user, $remote_user);
 &foreign_require("webmin", "webmin-lib.pl");

acl/feedback_files.pl

@@ -1,6 +1,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 do 'acl-lib.pl';
 our ($config_directory);
 

acl/index.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $base_remote_user);
 &ReadParse();

acl/list_sessions.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, %sessiondb);
 $access{'sessions'} || &error($text{'sessions_ecannot'});

acl/log_parser.pl

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 do 'acl-lib.pl';
 our (%text);
 

acl/makedn.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'sql_ecannot'});

acl/maketables.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'sql_ecannot'});

acl/postinstall.pl

@@ -1,6 +1,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require 'acl-lib.pl';
 our ($config_directory);
 

acl/save_acl.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $base_remote_user, %gconfig,
      $config_directory);

acl/save_group.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $config_directory);
 &ReadParse();

acl/save_pass.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'pass_ecannot'});

acl/save_sql.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'sql_ecannot'});

acl/save_sync.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $module_config_directory);
 &ReadParse();

acl/save_twofactor.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $base_remote_user);
 &foreign_require("webmin");

acl/save_unix.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 &ReadParse();

acl/save_user.cgi

@@ -4,6 +4,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $config_directory, $base_remote_user);
 &foreign_require("webmin", "webmin-lib.pl");

acl/schema.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'sql_ecannot'});

acl/switch.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, %sessiondb);
 &ReadParse();

acl/system_info.pl

@@ -1,6 +1,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, $remote_user, %sessiondb, $module_name);
 do 'acl-lib.pl';
 

acl/twofactor_form.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './acl-lib.pl';
 our (%in, %text, %config, %access, $base_remote_user);
 &foreign_require("webmin");

acl/useradmin_update.pl

@@ -1,6 +1,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 if (!$main::done_foreign_require{"acl","acl-lib.pl"}) {
 	do "acl-lib.pl";
 	}

ajaxterm/ajaxterm/qweb.py

@@ -1293,7 +1293,7 @@ class QWebWSGIServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
     """ QWebWSGIServer
         qweb_wsgi_autorun(wsgiapp,ip='127.0.0.1',port=8080,threaded=1)
         A WSGI HTTP server threaded or not and a function to automatically run your
-        app according to the environement (either standalone, CGI or FastCGI).
+        app according to the environment (either standalone, CGI or FastCGI).
 
         This feature is called QWeb autorun. If you want to  To use it on your
         application use the following lines at the end of the main application
@@ -1303,7 +1303,7 @@ class QWebWSGIServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
             qweb.qweb_wsgi_autorun(your_wsgi_app)
 
         this function will select the approriate running mode according to the
-        calling environement (http-server, FastCGI or CGI).
+        calling environment (http-server, FastCGI or CGI).
     """
     def __init__(self, wsgiapp, ip, port, threaded=1, log=1):
         BaseHTTPServer.HTTPServer.__init__(self, (ip, port), QWebWSGIHandler)

ajaxterm/index.cgi

@@ -3,6 +3,8 @@
 # a URL that proxies to it
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 BEGIN { push(@INC, ".."); };
 use WebminCore;
@@ -70,6 +72,8 @@ while(1) {
 close(TEST2);
 use strict "subs";
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 # Show the iframe
 print "<center>\n";

ajaxterm/proxy.cgi

@@ -2,6 +2,8 @@
 # Proxy an Ajaxterm request to the real port
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 BEGIN { push(@INC, ".."); };
 use WebminCore;

apache/config-AlmaLinux-7.0-ALL

@@ -1,4 +1,4 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types

apache/config-CentOS-Stream-Linux-8.0-ALL

@@ -1,9 +1,9 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types
 start_cmd=systemctl start httpd.service
-apply_cmd=/usr/sbin/apachectl graceful
+apply_cmd=systemctl reload httpd.service
 stop_cmd=systemctl stop httpd.service
 show_order=0
 max_servers=100
@@ -15,5 +15,5 @@ test_apachectl=1
 auto_mods=1
 show_names=0
 allow_virtualmin=0
-pid_file=/etc/httpd/run/httpd.pid
+pid_file=/run/httpd/httpd.pid
 format_config=1

apache/config-Fedora-Linux-20.00-ALL

@@ -0,0 +1,19 @@
+show_list=1
+httpd_dir=/etc/httpd
+httpd_path=/usr/sbin/httpd
+mime_types=/etc/mime.types
+start_cmd=systemctl start httpd.service
+apply_cmd=systemctl reload httpd.service
+stop_cmd=systemctl stop httpd.service
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+apachectl_path=/usr/sbin/apachectl
+test_always=0
+test_apachectl=1
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
+format_config=1

apache/config-Oracle-Linux-8.0-ALL

@@ -0,0 +1,19 @@
+show_list=1
+httpd_dir=/etc/httpd
+httpd_path=/usr/sbin/httpd
+mime_types=/etc/mime.types
+start_cmd=systemctl start httpd.service
+apply_cmd=systemctl reload httpd.service
+stop_cmd=systemctl stop httpd.service
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+apachectl_path=/usr/sbin/apachectl
+test_always=0
+test_apachectl=1
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
+format_config=1

apache/config-Redhat-Enterprise-Linux-7.0-ALL

@@ -1,4 +1,4 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types

apache/config-Rocky-Linux-7.0-ALL

@@ -1,4 +1,4 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types

apache/config-debian-linux-10.0-ALL

@@ -0,0 +1,23 @@
+httpd_dir=/etc/apache2
+httpd_path=/usr/sbin/apache2
+httpd_conf=/etc/apache2/apache2.conf
+mime_types=/etc/mime.types
+start_cmd=systemctl start apache2
+apply_cmd=systemctl reload apache2
+stop_cmd=systemctl stop apache2
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+test_always=0
+test_apachectl=1
+virt_file=/etc/apache2/sites-available
+link_dir=/etc/apache2/sites-enabled
+auto_mods=1
+defines_file=/etc/apache2/envvars
+defines_name=APACHE_ARGUMENTS
+apachectl_path=/usr/sbin/apache2ctl
+show_names=0
+allow_virtualmin=0
+format_config=1
+show_list=1

apache/config-redhat-linux-24.0-ALL

@@ -1,9 +1,9 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types
 start_cmd=systemctl start httpd.service
-apply_cmd=/usr/sbin/apachectl graceful
+apply_cmd=systemctl reload httpd.service
 stop_cmd=systemctl stop httpd.service
 show_order=0
 max_servers=100
@@ -15,4 +15,5 @@ test_apachectl=1
 auto_mods=1
 show_names=0
 allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
 format_config=1

apache/show.cgi

@@ -68,8 +68,8 @@ print "<table border><tr><td $cb><pre>\n\n";
 &show_directives($conf, 0);
 print "</pre></td></tr></table>\n";
 print "</td></tr>\n";
-
-if ($in{'virt'} || $in{'file'} || defined($in{'idx'})) {
+if ($access{'types'} eq '*' &&
+   ($in{'virt'} || $in{'file'} || defined($in{'idx'}))) {
 	print "<tr>\n";
 	print "<td><form action=manual_form.cgi>";
 	print "<input type=submit name=these value='$text{'show_these'}'>";

at/acl_security.pl

@@ -1,5 +1,7 @@
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require 'at-lib.pl';

at/backup_config.pl

@@ -1,5 +1,7 @@
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %config;
 
 do 'at-lib.pl';

at/cgi_args.pl

@@ -1,5 +1,7 @@
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %access;
 
 do 'at-lib.pl';

at/create_job.cgi

@@ -3,6 +3,8 @@
 # Create a new at job
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%access, %text, %in);
 
 require './at-lib.pl';

at/delete_job.cgi

@@ -2,6 +2,8 @@
 # Delete or run an at job
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in); 
 
 require './at-lib.pl';

at/delete_jobs.cgi

@@ -2,6 +2,8 @@
 # Delete multiple at jobs
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our(%access, %text, %in);
 
 require './at-lib.pl';

at/edit_job.cgi

@@ -3,6 +3,8 @@
 # Display a command for deletion
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%access, %text, %in);
 
 require './at-lib.pl';

at/freebsd-lib.pl

@@ -1,6 +1,8 @@
 # freebsd-lib.pl
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 no warnings "redefine";
 our (%config);
 

at/index.cgi

@@ -7,6 +7,8 @@
 #   ext_cmd  : default command
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%access, %text, %in, %config);
 our ($module_name, $remote_user);
 

at/install_check.pl

@@ -1,6 +1,8 @@
 # install_check.pl
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 do 'at-lib.pl';
 

at/linux-lib.pl

@@ -1,6 +1,8 @@
 # linux-lib.pl
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 no warnings "redefine";
 our (%config);
 

at/log_parser.pl

@@ -2,6 +2,8 @@
 # Functions for parsing this module's logs
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %text;
 
 do 'at-lib.pl';

at/macos-lib.pl

@@ -1,6 +1,8 @@
 # macos-lib.pl
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 no warnings "redefine";
 our %config;
 

at/save_allow.cgi

@@ -2,6 +2,8 @@
 # Update allowed or denied At users
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%access, %text, %in);
 
 require './at-lib.pl';

at/solaris-lib.pl

@@ -1,6 +1,8 @@
 # solaris-lib.pl
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 no warnings "redefine";
 our %config;
 

backup-config/backup-config-lib.pl

@@ -13,6 +13,8 @@ Functions for creating configuration file backups. Some example code :
 BEGIN { push(@INC, ".."); };
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 use WebminCore;
 our (%text, $module_config_directory, %config);
 &init_config();

backup-config/backup.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './backup-config-lib.pl';
 our (%in, %text, %config, $module_config_file);
 &ReadParse();

backup-config/backup.pl

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %config, $no_acl_check);
 $no_acl_check++;
 require './backup-config-lib.pl';

backup-config/cgi_args.pl

@@ -1,6 +1,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 do 'backup-config-lib.pl';
 
 sub cgi_args

backup-config/edit.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './backup-config-lib.pl';
 our (%in, %text);
 &ReadParse();

backup-config/index.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './backup-config-lib.pl';
 our (%text, %in, %config);
 &ReadParse();

backup-config/lang/zh

@@ -2,21 +2,21 @@ index_title=备份配置文件
 index_emods=系统上没有Webmin模块支持配置备份。
 index_dest=备份目的地
 index_mods=Webmin模块
-index_sched=预定的？
+index_sched=计划的？
 index_when=是， $1
 index_count=$1个模块
-index_add=添加新的预定备份。
-index_none=尚未定义计划的备份。
+index_add=添加新的备份计划。
+index_none=无备份计划。
 index_header=立即备份配置
 index_now=立即备份
-index_return=计划备份列表
+index_return=备份计划列表
 index_return2=备份和还原表格
 index_header2=立即还原配置
 index_now2=立即还原
 index_apply=应用配置？
 index_test=仅显示将恢复的内容？
 index_jobs=预定备份
-index_nostrftime=警告-一些备份作业在其文件名中使用％，但是在“模块配置”页面上未启用strftime替换。
+index_nostrftime=警告-一些备份作业在其文件名中使用“％”，但是在“模块配置”页面上未启用strftime替换。
 index_tabsched=计划备份
 index_tabbackup=立即备份
 index_tabrestore=立即还原
@@ -68,7 +68,7 @@ backup_enone2=备份中没有所选模块的文件
 backup_epre2=模块 $1拒绝还原： $2
 
 backup_err=备份失败
-backup_edest=绝对本地文件丢失或无效
+backup_edest=绝对路径的文件丢失或无效
 backup_eserver1=FTP服务器丢失或无效
 backup_eserver2=SSH服务器丢失或无效
 backup_epath=FTP服务器上的绝对路径丢失或无效
@@ -80,7 +80,7 @@ backup_esport=缺少或无效的SSH服务器端口
 backup_emods=未选择模块
 backup_title=备份配置
 backup_doing=开始将模块配置文件备份到 $1 ..
-backup_failed=..失败了！ $1
+backup_failed=寄了！ $1
 backup_done=..完成。最终备份大小为 $1，其中包含 $2个文件。
 
 restore_err=恢复失败
@@ -88,8 +88,8 @@ restore_emods=未选择模块或其他文件
 restore_title=恢复配置
 restore_doing=从 $1..开始恢复模块配置文件。
 restore_testing=从 $1..中提取备份的内容
-restore_failed=..失败了！ $1
-restore_done=..完成。已还原 $1个文件。
+restore_failed=寄了！ $1
+restore_done=..完成。已恢复 $1个文件。
 restore_done2=..备份中的文件是：
 
 nice_ftp=通过FTP在 $1上的 $2
@@ -109,14 +109,14 @@ log_run_backup=已将 $1个模块备份到 $2
 run_title=备份配置
 run_doing=正在将 $1个模块备份到 $2 ..
 run_ok=..备份成功完成。
-run_failed=..备份失败！有关原因，请参见上面的错误消息。
+run_failed=寄了！请参阅上面的错误消息。
 
-email_mods=模块备份：
+email_mods=备份模块：
 email_failed=到 $1失败：
 email_ok=到 $1成功。
-email_sfailed=$1上的配置备份失败
-email_sok=$1上的配置备份成功
+email_sfailed=$1的配置备份失败
+email_sok=$1的配置备份成功
 email_final=最终备份文件的大小为 $1
 email_pre=运行备份前命令 $1 ..
 email_post=运行备份后命令 $1 ..
-email_prefailed=备份前命令失败！
+email_prefailed=备份前执行的命令寄了！

backup-config/log_parser.pl

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 do 'backup-config-lib.pl';
 our (%text);
 

backup-config/module.info.zh

@@ -0,0 +1,2 @@
+desc=备份配置文件
+longdesc=进行手动或计划备份、恢复Webmin模块的配置文件

backup-config/module.info.zh.auto

@@ -1,2 +0,0 @@
-desc_zh=备份配置文件
-longdesc_zh=对Webmin模块管理的配置文件执行手动或计划的备份和还原。

backup-config/restore.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './backup-config-lib.pl';
 our (%in, %text, %config, $module_config_file);
 &ReadParseMime();

backup-config/save.cgi

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './backup-config-lib.pl';
 our (%in, %text, $cron_cmd, $module_name);
 &ReadParse();

backup-config/uninstall.pl

@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require 'backup-config-lib.pl';
 
 sub module_uninstall

bin/disable-proxy

@@ -2,6 +2,7 @@
 # disable-proxy - Reverse/remove the configuration options set by enable-proxy.
 use strict;
 use warnings;
+
 BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Color'; }
 use 5.010; # Version in CentOS 6
 

bin/disable-twofactor

@@ -2,6 +2,7 @@
 # disable-twofactor - Disable two-factor authentication for a user. 
 use strict;
 use warnings;
+
 BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Color'; }
 use 5.010; # Version in CentOS 6
 

bin/enable-proxy

@@ -3,6 +3,7 @@
 # through a proxy.
 use strict;
 use warnings;
+
 BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Color'; }
 use 5.010; # Version in CentOS 6
 

bin/language-manager

@@ -3,6 +3,7 @@
 
 use strict;
 use warnings;
+
 use 5.014;
 
 use File::Spec;

bin/list-config

@@ -3,6 +3,7 @@
 # module.
 use strict;
 use warnings;
+
 BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Color'; }
 use 5.010; # Version in CentOS 6
 

bin/server

@@ -22,7 +22,7 @@ sub main
     # If username passed as regular param
     my $cmd = scalar(@ARGV) == 1 && $ARGV[0];
     $cmd = $opt{'command'} if ($opt{'command'});
-    if ($cmd !~ /^(status|start|stop|restart|reload|force-restart|force-reload|kill)$/) {
+    if ($cmd !~ /^(status|start|stop|restart|reload|force-restart|kill)$/) {
         $cmd = undef;
     }
 
@@ -70,7 +70,7 @@ sub run
         my $rs = system("$o->{'config'}/$o->{'cmd'} $service");
         exit $rs;
     }
-    if ($o->{'cmd'} =~ /^(kill|force-kill)$/) {
+    if ($o->{'cmd'} =~ /^(kill)$/) {
         my $rs;
         if (-x $systemctlcmd) {
             $rs = system("$systemctlcmd stop $service");
@@ -79,7 +79,7 @@ sub run
         $rs = system("$o->{'config'}/.stop-init --kill >/dev/null 2>&1 $service");
         exit $rs;
     }
-    if ($o->{'cmd'} =~ /^(force-reload|force-restart)$/) {
+    if ($o->{'cmd'} =~ /^(force-restart)$/) {
         my $rs = system("$o->{'config'}/restart-by-force-kill $service");
         exit $rs;
     }
@@ -164,15 +164,10 @@ sub root
    - start
    - stop
    - restart
-   - reload
    - force-restart
-   - force-reload
+   - reload
    - kill
 
- Alias commands:
-   - force-restart | force-reload
-   - kill | force-kill
-
 =back
 
 =head1 LICENSE AND COPYRIGHT

bin/set-config

@@ -3,6 +3,7 @@
 # restart Webmin to apply the change.
 use strict;
 use warnings;
+
 BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Color'; }
 use 5.010; # Version in CentOS 6
 

bin/webmin

@@ -69,7 +69,7 @@ sub main {
                     read_file($mod, \%mod_info);
                     my $mod_ver = $mod_info{'version_actual'} || $mod_info{'version'};
                     my $mod_desc = $mod_info{'desc'};
-                    if ($mod_ver && $prod_ver && $mod_desc && $mod_ver ne $prod_ver) {
+                    if ($mod_ver && $prod_ver && $mod_desc && $prod_ver !~ /^$mod_ver/) {
                         say  CYAN, "  $module_type: ", RESET if (!$head++);
                         my ($mod_dir) = $mod =~ m/$prod_root\/(.*?)\//;
                         push(@minfo, {'desc' => $mod_desc, 'ver' => $mod_ver, 'dir' => $mod_dir});
@@ -105,13 +105,18 @@ sub main {
             my $ver1 = "$root/version";
             my $ver2 = "$opt{'config'}/version";
             my $ver = read_file_contents($ver1) || read_file_contents($ver2);
+            my $verrel_file = "$root/release";
+            my $verrel = -r $verrel_file ? read_file_contents($verrel_file) : "";
+            if ($verrel) {
+                $verrel = ":@{[trim($verrel)]}";
+            }
             $ver = trim($ver);
             if ($ver) {
                 if ($opt{'version'}) {
-                    say $ver;
+                    say "$ver$verrel";
                     exit 0;
                 } else {
-                    say CYAN, "Webmin: ", RESET, &$ver_checked($versions_remote{'webmin'}, $ver), DARK " [$root]", RESET;
+                    say CYAN, "Webmin: ", RESET, &$ver_checked($versions_remote{'webmin'}, "$ver$verrel"), DARK " [$root]", RESET;
                 }
             } else {
                 say RED, "Error: ", RESET, "Cannot determine Webmin version";
@@ -153,7 +158,12 @@ sub main {
                         my $uver1 = "$uroot/version";
                         my $uver2 = "$wmumconfig/version";
                         my $uver = read_file_contents($uver1) || read_file_contents($uver2);
-                        $uver = trim($uver);
+                        my $uverrel_file = "$uroot/release";
+                        my $uverrel      = -r $uverrel_file ? read_file_contents($uverrel_file) : "";
+                        if ($uverrel) {
+                            $uverrel = ":@{[trim($uverrel)]}";
+                        }
+                        $uver = trim($uver) . $uverrel;
                         if ($uver) {
                             say CYAN, "Usermin: ", RESET, &$ver_checked($versions_remote{'usermin'}, $uver), DARK " [$uroot]", RESET;
                             my ($udir, @uthemes, @umods);

bind8/acl_security.pl

@@ -1,5 +1,7 @@
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 require 'bind8-lib.pl';
 # Globals from bind8-lib.pl

bind8/backup_config.pl

@@ -1,5 +1,7 @@
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 do 'bind8-lib.pl';
 # Globals from bind8-lib.pl

bind8/bind8-lib.pl

@@ -3,8 +3,9 @@
 
 use strict;
 use warnings;
-use Time::Local;
 no warnings 'redefine';
+no warnings 'uninitialized';
+use Time::Local;
 
 BEGIN { push(@INC, ".."); };
 use WebminCore;
@@ -1298,7 +1299,7 @@ elsif ($type eq "DMARC") {
 			     [ 's', $text{'value_dmarcfos'} ] ]));
 	}
 elsif ($type eq "NSEC3PARAM") {
-	# NSEC records have a hash type, flags, number of interations, salt
+	# NSEC records have a hash type, flags, number of iterations, salt
 	# length and salt
 	print &ui_table_row($text{'value_NSEC3PARAM1'},
 		&ui_select("value0", $v[0] || 1,
@@ -1689,7 +1690,7 @@ return $chroot.$_[0];
 }
 
 # has_ndc(exclude-mode)
-# Returns 2 if rndc is installed, 1 if ndc is instaled, or 0
+# Returns 2 if rndc is installed, 1 if ndc is installed, or 0
 # Mode 2 = try ndc only, 1 = try rndc only, 0 = both
 sub has_ndc
 {
@@ -2833,13 +2834,14 @@ foreach my $slave (@slaves) {
 	my @otherslaves;
 	if ($config{'other_slaves'}) {
 		@otherslaves = grep { $_ ne '' }
-				  map { &to_ipaddress($_->{'host'}) }
+				  map { &to_ipaddress($_->{'host'}) ||
+					&to_ip6address($_->{'host'}) }
 				      grep { $_ ne $slave } @slaves;
 		}
 	if ($config{'extra_slaves'}) {
 		push(@otherslaves,
 		     grep { $_ ne '' } 
-                          map { &to_ipaddress($_) }
+                          map { &to_ipaddress($_) || &to_ip6address($_) }
 			      split(/\s+/, $config{'extra_slaves'}));
 		}
 	if ($moreslaves) {
@@ -3715,7 +3717,7 @@ return wantarray ? @rv : $rv[0];
 }
 
 # compute_dnssec_key_size(algorithm, def-mode, size)
-# Given an algorith and size mode (0=entered, 1=average, 2=big), returns either
+# Given an algorithm and size mode (0=entered, 1=average, 2=big), returns either
 # 0 and an error message or 1 and the corrected size
 sub compute_dnssec_key_size
 {
@@ -4055,7 +4057,7 @@ sub dt_resign_zone
 }
 
 # dt_zskroll_zone(zone-name)
-# Initates a zsk rollover operation for the zone 
+# Initiates a zsk rollover operation for the zone 
 sub dt_zskroll_zone
 {
 	my ($d) = @_;
@@ -4068,7 +4070,7 @@ sub dt_zskroll_zone
 }
 
 # dt_kskroll_zone(zone-name)
-# Initates a ksk rollover operation for the zone 
+# Initiates a ksk rollover operation for the zone 
 sub dt_kskroll_zone
 {
 	my ($d) = @_;