Merge pull request #2694 from swelljoe/login-redirect-password

Remove login_redirect

.gitignore

@@ -22,3 +22,4 @@ tarballs/
 minimal/
 .DS_Store
 .vscode/settings.json
+debug.cgi

CHANGELOG.md

@@ -1,5 +1,42 @@
 ## Changelog
 
+#### 2.641 (May 10, 2026)
+* Fixed a bug when editing monitors in the System and Server Status module
+* Fix Fail2Ban default jail options
+* Added support for trusted proxy IP addresses
+
+#### 2.640 (May 4, 2026)
+* Add new nftables module with profiles, saved tables, and chains/sets management
+* Add new Nginx module with look and feel matching the Apache module
+* Add option to hide sensitive values (like passwords or tokens) from Webmin's request logs
+* Add custom ACME server support for Webmin SSL renewal
+* Add support for the latest MariaDB on Ubuntu 26.04
+* Add multi-statement SQL query support when executing inline in MySQL/MariaDB module
+* Add support for ext4 hidden inode quota mode
+* Add used space and usage percentage reporting for ZFS in the dashboard
+* Add mass enable and disable buttons for status monitors in the System and Server Status module
+* Update tiny ACME client to the latest version
+* Update DHCP default config for openSUSE 16 [#2678](https://github.com/webmin/webmin/issues/2678)
+* Fix to prevent bypassing two-factor authentication in RPC requests
+* Fix session cookies to use safer defaults
+* Fix handling of connections coming through a reverse proxy
+* Fix unsafe mailbox attachment handling in Mailbox module
+* Fix unsafe decoding of Outlook `winmail.dat` attachments
+* Fix Certbot standalone port conflicts
+* Fix to correctly preserve full quoted action parameters in the Fail2Ban jail editor [#2647](https://github.com/webmin/webmin/issues/2647)
+* Fix Fail2Ban default jail options to preserve required timing defaults when saving
+* Fix ZFS to fall back to `df` when disk space cannot be computed from `zpool`
+* Fix to allow toggling process priority and I/O controls on or off
+* Fix issue where disabled email notifications were still being processed
+* Update Authentic theme to the latest version with various improvements and fixes:
+  - Upgrade stats history graphs from laggy SVG to a blazing-fast canvas renderer
+  - Add option to control corner roundness for the menu, content area and right-side slider
+  - Change the content area to use rounded corners and a margin by default
+  - Fix message of the day display in login page correctly [webmin#2555](https://github.com/webmin/webmin/issues/2685)
+  - Fix tooltip visibility in dark palette
+  - Fix session login button spinner
+  - Fix various button styling issues (active state, tiny buttons, airy buttons, stack position)
+
 #### 2.630 (March 24, 2026)
 * Add improvements to user input validation across all modules
 * Update Authentic theme to the latest version with various improvements and fixes:
@@ -542,7 +579,7 @@ This release adds automatic translations for all languages in UTF-8, updates the
 This release updates the built-in Let's Encrypt client, adds support for creating "safe-mode" Webmin users, support for CAA records in the BIND module, and the ability to search Postfix maps. It also updates the Authentic theme to the latest version, which includes numerous improvements to the File Manager and overall UI.
 
 #### Version 1.930 (August 18, 2019)
-These updates fix a [security vulnerability](http://webmin.com/security.html) and should be installed IMMEDIATELY by all users. Although it is not exploitable in a Webmin install with the default configuration, upgrading is strongly recommended.
+These updates fix a [security vulnerability](https://webmin.com/security/) and should be installed IMMEDIATELY by all users. Although it is not exploitable in a Webmin install with the default configuration, upgrading is strongly recommended.
 
 #### Version 1.920 (July 4, 2019)
 This update includes the latest theme version, translation updates, the ability to disable hosts file entries, easier monitoring of bootup actions, and a bunch of bugfixes.

README-zh.md

@@ -1,7 +1,7 @@
 ## 内容
 * [更新日志](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)
+* [安装](#安装)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-stable.png?raw=true" title="稳定版">](https://webmin.com/download.html)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-devel.png?raw=true" title="Development Versions">](https://webmin.com/devel.html)
 * [文档](#文档)
 * [致谢](#致谢)
 * [许可](#许可)
@@ -26,11 +26,11 @@ Perl 5.10 或更高。
 ## 安装
 Webmin 可以两种方法安装：
 
- 1. 下载一个预编译包，可用于不同的发行版（CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris 和 [其他发行版](http://www.webmin.com/support.html)）。[下载页面直达车](http://webmin.com/download.html);
+ 1. 下载一个预编译包，可用于不同的发行版（CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris 和 [其他发行版](https://webmin.com/support.html)）。[下载页面直达车](https://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) 脚本，无需任何选项，也就是说会直接安装到当前目录。或者使用命令行参数，例如目标目录。
+ 2. 下载并解压[源码](https://prdownloads.sourceforge.net/webadmin/webmin-1.996.tar.gz)然后运行[_setup.sh_](https://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>
+  <kbd>注：如果你正在安装 Webmin [到Windows](https://webmin.com/windows.html) 系统上，你必须运行 `perl setup.pl` 命令。Windows 版能否正常运行取决于许多程序，和可能不属于标准发行版的模块。你需要 _process.exe_ 命令， _sc.exe_ 命令，以及 _Win32::Daemon_ Perl 模块。</kbd>
 
 ## 文档
 完整的 Webmin 还有它所有模块的详细配置都在[维基页面](https://doxfer.webmin.com/Webmin/Main_Page).
@@ -39,7 +39,7 @@ Webmin 可以两种方法安装：
 
 ### 首席开发者
 
-* [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)
+* [Jamie Cameron](https://webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
 
 ### 贡献者
 

README.md

@@ -45,7 +45,7 @@ For detailed installation instructions check our guide on [webmin.com/download](
 
 ### Lead developer
 
-* [Jamie Cameron](https://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)
+* [Jamie Cameron](https://webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
 
 ### Developers
 * [Ilia Rostovtsev](https://github.com/iliaross)

apache/acl_security.pl

@@ -5,115 +5,84 @@ require 'apache-lib.pl';
 # Output HTML for editing security options for the apache module
 sub acl_security_form
 {
-print "<tr> <td valign=top rowspan=4><b>$text{'acl_virts'}</b></td>\n";
+my ($o) = @_;
-print "<td rowspan=4 valign=top>\n";
+
-printf "<input type=radio name=virts_def value=1 %s> %s\n",
+my $conf = &get_config();
-	$_[0]->{'virts'} eq '*' ? 'checked' : '', $text{'acl_vall'};
+my @virts = ( { 'value' => '__default__' },
-printf "<input type=radio name=virts_def value=0 %s> %s<br>\n",
+	      &find_directive_struct("VirtualHost", $conf) );
-	$_[0]->{'virts'} eq '*' ? '' : 'checked', $text{'acl_vsel'};
+my @vsel = $o->{'virts'} eq '*' ? () : split(/\s+/, $o->{'virts'});
-print "<select name=virts multiple size=5>\n";
+my %vcan = map { $_, 1 } @vsel;
-local $conf = &get_config();
+my @vopts;
-local @virts = ( { 'value' => '__default__' },
+foreach my $v (@virts) {
-		 &find_directive_struct("VirtualHost", $conf) );
+	my @vn = &virt_acl_name($v);
-local %vcan = map { $_, 1 } split(/\s+/, $_[0]->{'virts'});
+	my ($can) = grep { $vcan{$_} } @vn;
-local $v;
+	my $show = $can || $vn[0];
-foreach $v (@virts) {
+	push(@vopts, [ $show,
-	local @vn = &virt_acl_name($v);
+		       $show eq "__default__" ? $text{'acl_defserv'}
-	local ($can) = grep { $vcan{$_} } @vn;
+					      : $show ]);
-	local $vn = $can || $vn[0];
-	printf "<option value=\"%s\" %s>%s</option>\n",
-		$vn, $can ? "selected" : "",
-		$vn eq "__default__" ? $text{'acl_defserv'} : $vn;
 	delete($vcan{$can}) if ($can);
 	}
-foreach $vn (keys %vcan) {
+print &ui_table_row($text{'acl_virts'},
-	next if ($vn eq "*");
+	&ui_radio("virts_def", $o->{'virts'} eq '*' ? 1 : 0,
-	printf "<option value=\"%s\" %s>%s</option>\n",
+		  [ [ 1, $text{'acl_vall'} ],
-		$vn, "selected",
+		    [ 0, $text{'acl_vsel'} ] ])."<br>\n".
-		$vn eq "__default__" ? $text{'acl_defserv'} : $vn;
+	&ui_select("virts", \@vsel, \@vopts, 5, 1, 1),
+	3);
+
+print &ui_table_row($text{'acl_global'},
+	&ui_select("global",
+		   defined($o->{'global'}) && $o->{'global'} ne '' ?
+			$o->{'global'} : 0,
+		   [ [ 1, $text{'yes'} ],
+		     [ 2, $text{'acl_htaccess'} ],
+		     [ 0, $text{'no'} ] ]));
+print &ui_table_row($text{'acl_create'},
+	&ui_yesno_radio("create", $o->{'create'}));
+
+print &ui_table_row($text{'acl_vuser'},
+	&ui_yesno_radio("vuser", $o->{'vuser'}));
+print &ui_table_row($text{'acl_vaddr'},
+	&ui_yesno_radio("vaddr", $o->{'vaddr'}));
+
+print &ui_table_row($text{'acl_pipe'},
+	&ui_yesno_radio("pipe", $o->{'pipe'}));
+print &ui_table_row($text{'acl_stop'},
+	&ui_yesno_radio("stop", $o->{'stop'}));
+
+print &ui_table_row($text{'acl_apply'},
+	&ui_yesno_radio("apply", $o->{'apply'}));
+print &ui_table_row($text{'acl_names'},
+	&ui_yesno_radio("names", $o->{'names'}));
+
+print &ui_table_row($text{'acl_dir'},
+	&ui_textbox("dir", $o->{'dir'}, 30)." ".
+	&file_chooser_button("dir", 1),
+	3);
+
+print &ui_table_row($text{'acl_aliasdir'},
+	&ui_textbox("aliasdir", $o->{'aliasdir'}, 30)." ".
+	&file_chooser_button("aliasdir", 1),
+	3);
+
+my @typesel = $o->{'types'} eq '*' ? () : split(/\s+/, $o->{'types'});
+my @typeopts;
+for (my $i = 0; $text{"type_$i"}; $i++) {
+	push(@typeopts, [ $i, $text{"type_$i"} ]);
 	}
-print "</select></td>\n";
+print &ui_table_row($text{'acl_types'},
+	&ui_radio("types_def", $o->{'types'} eq '*' ? 1 : 0,
+		  [ [ 1, $text{'acl_all'} ],
+		    [ 0, $text{'acl_sel'} ] ])."<br>\n".
+	&ui_select("types", \@typesel, \@typeopts, 5, 1),
+	3);
 
-print "<td><b>$text{'acl_global'}</b></td> <td><select name=global>\n";
+print &ui_table_row($text{'acl_dirs'},
-printf "<option value=1 %s>$text{'yes'}</option>\n",
+	&ui_radio("dirsmode", $o->{'dirsmode'},
-	$_[0]->{'global'} == 1 ? "selected" : "";
+		  [ [ 0, $text{'acl_dirs0'} ],
-printf "<option value=2 %s>$text{'acl_htaccess'}</option>\n",
+		    [ 1, $text{'acl_dirs1'} ],
-	$_[0]->{'global'} == 2 ? "selected" : "";
+		    [ 2, $text{'acl_dirs2'} ] ])."<br>\n".
-printf "<option value=0 %s>$text{'no'}</option></select></td> </tr>\n",
+	&ui_textarea("dirs", join("\n", split(/\s+/, $o->{'dirs'})), 5, 50),
-	$_[0]->{'global'} == 0 ? "selected" : "";
+	3);
-
-print "<tr> <td><b>$text{'acl_create'}</b></td> <td>\n";
-printf "<input type=radio name=create value=1 %s> $text{'yes'}\n",
-	$_[0]->{'create'} ? "checked" : "";
-printf "<input type=radio name=create value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'create'} ? "" : "checked";
-
-print "<tr> <td><b>$text{'acl_vuser'}</b></td> <td>\n";
-printf "<input type=radio name=vuser value=1 %s> $text{'yes'}\n",
-	$_[0]->{'vuser'} ? "checked" : "";
-printf "<input type=radio name=vuser value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'vuser'} ? "" : "checked";
-
-print "<tr> <td><b>$text{'acl_vaddr'}</b></td> <td>\n";
-printf "<input type=radio name=vaddr value=1 %s> $text{'yes'}\n",
-	$_[0]->{'vaddr'} ? "checked" : "";
-printf "<input type=radio name=vaddr value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'vaddr'} ? "" : "checked";
-
-print "<tr> <td><b>$text{'acl_pipe'}</b></td> <td>\n";
-printf "<input type=radio name=pipe value=1 %s> $text{'yes'}\n",
-	$_[0]->{'pipe'} ? "checked" : "";
-printf "<input type=radio name=pipe value=0 %s> $text{'no'}</td>\n",
-	$_[0]->{'pipe'} ? "" : "checked";
-
-print "<td><b>$text{'acl_stop'}</b></td> <td>\n";
-printf "<input type=radio name=stop value=1 %s> $text{'yes'}\n",
-	$_[0]->{'stop'} ? "checked" : "";
-printf "<input type=radio name=stop value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'stop'} ? "" : "checked";
-
-print "<tr> <td><b>$text{'acl_apply'}</b></td> <td>\n";
-printf "<input type=radio name=apply value=1 %s> $text{'yes'}\n",
-	$_[0]->{'apply'} ? "checked" : "";
-printf "<input type=radio name=apply value=0 %s> $text{'no'}</td>\n",
-	$_[0]->{'apply'} ? "" : "checked";
-
-print "<td><b>$text{'acl_names'}</b></td> <td>\n";
-printf "<input type=radio name=names value=1 %s> $text{'yes'}\n",
-	$_[0]->{'names'} ? "checked" : "";
-printf "<input type=radio name=names value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'names'} ? "" : "checked";
-
-print "<tr> <td><b>$text{'acl_dir'}</b></td>\n";
-printf "<td colspan=3><input name=dir size=30 value='%s'> %s</td> </tr>\n",
-	$_[0]->{'dir'}, &file_chooser_button("dir", 1);
-
-print "<tr> <td><b>$text{'acl_aliasdir'}</b></td>\n";
-printf "<td colspan=3><input name=aliasdir size=30 value='%s'> %s</td> </tr>\n",
-	$_[0]->{'aliasdir'}, &file_chooser_button("aliasdir", 1);
-
-print "<tr> <td valign=top><b>$text{'acl_types'}</b></td>\n";
-print "<td colspan=3>\n";
-printf "<input type=radio name=types_def value=1 %s> $text{'acl_all'}&nbsp;\n",
-	$_[0]->{'types'} eq '*' ? "checked" : "";
-printf "<input type=radio name=types_def value=0 %s> $text{'acl_sel'}<br>\n",
-	$_[0]->{'types'} eq '*' ? "" : "checked";
-map { $types{$_}++ } split(/\s+/, $_[0]->{'types'});
-print "<select name=types size=5 multiple>\n";
-for($i=0; $text{"type_$i"}; $i++) {
-	printf "<option value=\"%d\" %s>%s</option>\n",
-		$i, $types{$i} ? "selected" : "", $text{"type_$i"};
-	}
-print "</select></td> </tr>\n";
-
-print "<tr> <td valign=top><b>$text{'acl_dirs'}</b></td>\n";
-print "<td colspan=3>\n";
-print &ui_radio("dirsmode", $_[0]->{'dirsmode'},
-		[ [ 0, $text{'acl_dirs0'} ],
-		  [ 1, $text{'acl_dirs1'} ],
-		  [ 2, $text{'acl_dirs2'} ] ]),"<br>\n";
-print &ui_textarea("dirs", join("\n", split(/\s+/, $_[0]->{'dirs'})), 5, 50);
-print "</td> </tr>\n";
 }
 
 # acl_security_save(&options)
@@ -141,4 +110,3 @@ $_[0]->{'names'} = $in{'names'};
 $_[0]->{'dirsmode'} = $in{'dirsmode'};
 $_[0]->{'dirs'} = join(" ", split(/\s+/, $in{'dirs'}));
 }
-

apache/core.pl

@@ -73,11 +73,12 @@ $rv = [	[ 'AccessFileName', 0, 5, 'virtual', undef, 5 ],
 	[ 'Options', 0, 5, 'virtual directory htaccess', undef, 3 ],
 	[ 'PidFile', 0, 9, 'global', -2.0 ],
 	[ 'Protocols', 0, 1, 'virtual', 2.4 ],
-	[ 'require', 0, 4, 'directory htaccess', undef, 6 ],
+	[ 'require', 0, 4, 'directory htaccess', '-2.4', 6 ],
+	[ 'Require allow deny order Satisfy', 1, 4, 'directory htaccess', 2.4, 6 ],
 	[ 'RLimitCPU', 0, 0, 'virtual', 1.2 ],
 	[ 'RLimitMEM', 0, 0, 'virtual', 1.2 ],
 	[ 'RLimitNPROC', 0, 0, 'virtual', 1.2 ],
-	[ 'Satisfy', 0, 4, 'directory htaccess', 1.2, 4 ],
+	[ 'Satisfy', 0, 4, 'directory htaccess', '1.2-2.4', 4 ],
 	[ 'ScoreBoardFile', 0, 9, 'global', '1.2-2.0' ],
 	[ 'SendBufferSize', 0, 1, 'global', -2.0 ],
 	[ 'ServerAdmin', 0, 1, 'virtual' ],
@@ -958,6 +959,234 @@ if ($in{'AuthType'}) { return ( [ $in{'AuthType'} ] ); }
 else { return ( [ ] ); }
 }
 
+# parse_access_require_rule(value)
+# Maps a Require line to a UI mode and value.
+sub parse_access_require_rule
+{
+my ($value) = @_;
+my $lv = lc($value);
+return ('granted', '') if ($lv eq 'all granted');
+return ('denied', '') if ($lv eq 'all denied');
+return ('local', '') if ($lv eq 'local');
+return ('valid-user', '') if ($lv eq 'valid-user');
+return ('file-owner', '') if ($lv eq 'file-owner');
+return ('file-group', '') if ($lv eq 'file-group');
+if ($value =~ /^(ip|host|env|user|group|method|expr)\s+(.+)$/i) {
+	return (lc($1), $2);
+	}
+return ('other', $value);
+}
+
+# legacy_access_rule_to_require(&directive)
+# Converts a single Allow rule from legacy syntax to a Require mode/value pair.
+sub legacy_access_rule_to_require
+{
+my ($dir) = @_;
+my $what = join(" ", @{$dir->{'words'}});
+$what =~ s/^from\s+//i;
+return ('granted', '') if (lc($what) eq 'all');
+return ('env', $1) if ($what =~ /^env=(\S+)$/i);
+return ($what =~ /^[0-9a-f\.\:\/]+$/i ? 'ip' : 'host', $what);
+}
+
+# legacy_access_to_require_rules(&allow, &deny, &order)
+# For the common Apache 2.4 cases, convert old Allow/Deny/Order rules to Require.
+sub legacy_access_to_require_rules
+{
+my ($allow, $deny, $order) = @_;
+my $orderv = @$order ? lc($order->[0]->{'value'}) : '';
+
+# allow from all
+if (@$allow == 1 && !@$deny && $allow->[0]->{'value'} =~ /^from\s+all$/i) {
+	return [ [ 'granted', '' ] ];
+	}
+
+# deny from all
+if (@$deny == 1 && !@$allow && $deny->[0]->{'value'} =~ /^from\s+all$/i) {
+	return [ [ 'denied', '' ] ];
+	}
+
+# deny from all, then allow some specific requests
+if ($orderv eq 'deny,allow' &&
+    @$deny == 1 &&
+    $deny->[0]->{'value'} =~ /^from\s+all$/i &&
+    @$allow) {
+	my @rv;
+	foreach my $dir (@$allow) {
+		push(@rv, [ &legacy_access_rule_to_require($dir) ]);
+		}
+	return \@rv;
+	}
+
+return [ ];
+}
+
+# access_require_conf_root()
+# Returns the outer-most config list that contains the current section.
+sub access_require_conf_root
+{
+return $vconf if (defined($vconf));
+return $hconf if (defined($hconf));
+return $conf;
+}
+
+# access_require_container_info(&requires, &satisfy)
+# Determines the current top-level Require container mode and rules.
+sub access_require_container_info
+{
+my ($requires, $satisfy) = @_;
+my @all = grep { $_->{'type'} } &find_directive_struct("RequireAll", $conf);
+my @any = grep { $_->{'type'} } &find_directive_struct("RequireAny", $conf);
+my @rules = @$requires;
+my $mode = @$satisfy ? lc($satisfy->[0]->{'value'}) : 'default';
+my $advanced = 0;
+
+if (@all || @any) {
+	$advanced = 1 if (@all + @any > 1 || @$requires || @$satisfy);
+	my $container = @all ? $all[0] : $any[0];
+	$mode = @all ? 'all' : 'any';
+	@rules = ( );
+	foreach my $m (@{$container->{'members'}}) {
+		next if ($m->{'name'} eq 'dummy');
+		if ($m->{'type'} || lc($m->{'name'}) ne 'require') {
+			$advanced = 1;
+			next;
+			}
+		push(@rules, $m);
+		}
+	}
+
+return ($mode, \@rules, $advanced);
+}
+
+sub edit_Require_allow_deny_order_Satisfy
+{
+my ($reqs, $allow, $deny, $order, $satisfy, $e) = @_;
+my (@mode, @value);
+my ($logic, $active_reqs, $advanced) =
+	&access_require_container_info($reqs, $satisfy);
+foreach my $req (@$active_reqs) {
+	my ($m, $v) = &parse_access_require_rule($req->{'value'});
+	push(@mode, $m);
+	push(@value, $v);
+	}
+
+my $has_legacy = @$allow || @$deny || @$order || @$satisfy;
+if (!@mode && $has_legacy) {
+	foreach my $r (@{&legacy_access_to_require_rules($allow, $deny, $order)}) {
+		push(@mode, $r->[0]);
+		push(@value, $r->[1]);
+		}
+	}
+
+push(@mode, "");
+push(@value, "");
+
+my $rv = "";
+if ($has_legacy) {
+	$rv .= &ui_alert($text{'core_require_legacy'}, 'warning',
+		["fa-info-circle", "", 1],
+		{ style => "margin-bottom: 5px;" });
+	}
+if ($advanced) {
+	$rv .= "<i>$text{'core_require_advanced'}</i><br>\n";
+	}
+$rv .= "$text{'core_require_logic'} ".
+	&select_input($logic, "Require_logic", "default",
+		"$text{'core_require_logic_default'},default",
+		"$text{'core_require_logic_any'},any",
+		"$text{'core_require_logic_all'},all")."<br>\n";
+$rv .= &ui_tag("div", "", { style => "height: 5px;" });
+$rv .= "<table border>\n".
+	"<tr $tb> <td><b>$text{'core_require_type'}</b></td> ".
+	"<td><b>$text{'core_require_value'}</b></td> </tr>\n";
+for(my $i=0; $i<@mode; $i++) {
+	$rv .= "<tr $cb>\n";
+	$rv .= "<td>".&select_input($mode[$i], "Require_mode_$i", "",
+		"$text{'default'},",
+		"$text{'core_require_granted'},granted",
+		"$text{'core_require_denied'},denied",
+		"$text{'core_require_local'},local",
+		"$text{'core_require_ip'},ip",
+		"$text{'core_require_host'},host",
+		"$text{'core_require_env'},env",
+		"$text{'core_require_user'},user",
+		"$text{'core_require_group'},group",
+		"$text{'core_require_validuser'},valid-user",
+		"$text{'core_require_fileowner'},file-owner",
+		"$text{'core_require_filegroup'},file-group",
+		"$text{'core_require_method'},method",
+		"$text{'core_require_expr'},expr",
+		"$text{'core_require_other'},other")."</td>\n";
+	$rv .= sprintf "<td><input name=Require_value_%d size=40 value=\"%s\"></td>\n",
+		$i, &html_escape($value[$i]);
+	$rv .= "</tr>\n";
+	}
+$rv .= "</table>\n";
+return (2, $text{'mod_access_restr'}, $rv);
+}
+
+sub save_Require_allow_deny_order_Satisfy
+{
+my (@req);
+for(my $i=0; defined($in{"Require_mode_$i"}); $i++) {
+	my $mode = $in{"Require_mode_$i"};
+	my $value = $in{"Require_value_$i"};
+	$value =~ /\r|\n|\0/ && &error($text{'enewline'});
+	$value =~ s/^\s+//;
+	$value =~ s/\s+$//;
+	next if (!$mode && $value eq '');
+	$mode || &error($text{'core_require_etype'});
+	if ($mode eq 'granted') {
+		push(@req, "all granted");
+		}
+	elsif ($mode eq 'denied') {
+		push(@req, "all denied");
+		}
+	elsif ($mode eq 'local' ||
+	       $mode eq 'valid-user' ||
+	       $mode eq 'file-owner' ||
+	       $mode eq 'file-group') {
+		push(@req, $mode);
+		}
+	elsif ($mode eq 'other') {
+		$value =~ /\S/ || &error($text{'core_require_evalue'});
+		push(@req, $value);
+		}
+	else {
+		$value =~ /\S/ || &error($text{'core_require_evalue'});
+		push(@req, "$mode $value");
+		}
+	}
+
+my $logic = $in{'Require_logic'} || 'default';
+my $root = &access_require_conf_root();
+my @all = grep { $_->{'type'} } &find_directive_struct("RequireAll", $conf);
+my @any = grep { $_->{'type'} } &find_directive_struct("RequireAny", $conf);
+my @containers = (@all, @any);
+
+if (@req && $logic ne 'default') {
+	my $new = {
+		'name' => $logic eq 'all' ? 'RequireAll' : 'RequireAny',
+		'value' => '',
+		'type' => 1,
+		'members' => [ map { {
+			'name' => 'Require',
+			'value' => $_,
+			'type' => 0,
+		} } @req ],
+	};
+	my $old = shift(@containers);
+	&save_directive_struct($old, $new, $conf, $root);
+	}
+
+foreach my $c (@containers) {
+	&save_directive_struct($c, undef, $conf, $root);
+	}
+
+return ( $logic eq 'default' ? \@req : [ ], [ ], [ ], [ ], [ ] );
+}
+
 sub edit_require
 {
 local($rv, $mode, $list);

apache/edit_defines.cgi

@@ -11,7 +11,8 @@ print $text{'defines_desc'},"<p>\n";
 @defs = &get_httpd_defines(1);
 if (@defs) {
 	print &text('defines_config',
-		  "<tt><b>".join(" ", @defs)."</b></tt>"),"<p>\n";
+		  "<tt><b>".&html_escape(join(" ", @defs))."</b></tt>"),
+	      "<p>\n";
 	}
 
 print &ui_form_start("save_defines.cgi", "post");

apache/edit_global.cgi

@@ -28,7 +28,7 @@ if ($in{'type'} == 6) {
 	print &ui_hr();
 	print &ui_subheading($text{'global_mime'});
 	print "$text{'global_mimedesc'}<p>\n";
-	@links = ( &ui_link("edit_gmime_type.cgi?file=$mfile",
+	@links = ( &ui_link("edit_gmime_type.cgi?file=".&urlize($mfile),
 	           $text{'global_add'}) );
 	print &ui_links_row(\@links);
 	print &ui_columns_start([ $text{'global_type'},
@@ -41,7 +41,8 @@ if ($in{'type'} == 6) {
 		if (/^\s*(\S+)\s*(.*)$/) {
 			print &ui_columns_row([
 				&ui_link("edit_gmime_type.cgi?line=$line".
-				"&file=$mfile", $1), $2 ]);
+				"&file=".&urlize($mfile), &html_escape($1)),
+				&html_escape($2) ]);
 			}
 		$line++;
 		}

apache/lang/ar.auto

@@ -330,7 +330,7 @@ acl_types=أنواع التوجيه المتاحة
 acl_all=الكل
 acl_sel=المحدد ..
 acl_names=يمكن تعديل أسماء الخادم؟
-acl_dirs=Apache directives available<br><font size=-1>(Subject to types limit above)</font>
+acl_dirs=توجيهات Apache المتاحة، وفقًا لأنواع التوجيهات المحددة أعلاه
 acl_dirs0=الكل
 acl_dirs1=المدرجة فقط ..
 acl_dirs2=كل ما عدا المدرجة ..

apache/lang/bg

@@ -329,7 +329,7 @@ acl_types=Налични видове директиви
 acl_all=Всички
 acl_sel=Избрани..
 acl_names=Може да редактира имена на сървъри?
-acl_dirs=Достъпни директиви на Apache<br><font size=-1>(съгласно лимита на типове по-горе)</font>
+acl_dirs=Налични директиви на Apache, ограничени от избраните по-горе типове директиви
 acl_dirs0=Всички
 acl_dirs1=Само изброените ..
 acl_dirs2=Всички освен изброените ..

apache/lang/ca

@@ -329,7 +329,7 @@ acl_types=Tipus de directives disponibles
 acl_all=Tots
 acl_sel=Seleccionats...
 acl_names=Pot editar els noms dels servidors
-acl_dirs=Directives Apache disponibles<br><font size=-1>(Subjectes al límit de tipus superior)</font>
+acl_dirs=Directives Apache disponibles, limitades pels tipus de directiva seleccionats a sobre
 acl_dirs0=Totes
 acl_dirs1=Només les llistades
 acl_dirs2=Totes excepte les llistades

apache/lang/cs

@@ -320,7 +320,7 @@ acl_types=Typy direktiv k dispozici
 acl_all=Všechny
 acl_sel=Vybrané..
 acl_names=Mohu upravovat názvy serverů?
-acl_dirs=Direktivy Apache jsou přístupné<br><font size=-1>(Subject to types limit above)</font>
+acl_dirs=Dostupné direktivy Apache, omezené typy direktiv vybranými výše
 acl_dirs0=Vše
 acl_dirs1=Jen vybrané ..
 acl_dirs2=Vše kromě vybraných ..

apache/lang/da

@@ -78,7 +78,7 @@ acl_types=Tilgængelige direktiv typer
 acl_all=Alle
 acl_sel=Valgte ..
 acl_names=Kan redigere servernavne?
-acl_dirs=Apache direktiver tilgængelige<br><font size=-1>(Subjekt tor type begrænsinger ovenfor)</font>
+acl_dirs=Tilgængelige Apache-direktiver, begrænset af de direktivtyper, der er valgt ovenfor
 acl_dirs0=Alle
 acl_dirs1=Kun listede ..
 acl_dirs2=Alle undtagen listede ..

apache/lang/de

@@ -331,7 +331,7 @@ acl_types=Verfügbare Direktiventypen
 acl_all=Alle
 acl_sel=Ausgewählt..
 acl_names=Kann Servernamen bearbeiten?
-acl_dirs=Verfügbare Apache-Direktiven<br><font size=-1>(Abhängig von obigen Typenbeschränkungen)</font>
+acl_dirs=Verfügbare Apache-Direktiven, eingeschränkt durch die oben ausgewählten Direktivtypen
 acl_dirs0=Alle
 acl_dirs1=Nur aufgeführte ..
 acl_dirs2=Alle außer aufgeführte ..

apache/lang/el

@@ -329,7 +329,7 @@ acl_types=Directive types available
 acl_all=All
 acl_sel=Selected..
 acl_names=Can edit server names?
-acl_dirs=Apache directives available<br><font size=-1>(Subject to types limit above)</font>
+acl_dirs=Διαθέσιμες οδηγίες Apache, περιορισμένες από τους τύπους οδηγιών που έχουν επιλεγεί παραπάνω
 acl_dirs0=All
 acl_dirs1=Only listed ..
 acl_dirs2=All except listed ..

apache/lang/en

@@ -332,7 +332,7 @@ acl_types=Directive types available
 acl_all=All
 acl_sel=Selected..
 acl_names=Can edit server names?
-acl_dirs=Apache directives available<br><font size=-1>(Subject to types limit above)</font>
+acl_dirs=Available Apache directives, limited by the directive types selected above
 acl_dirs0=All
 acl_dirs1=Only listed ..
 acl_dirs2=All except listed ..
@@ -873,6 +873,30 @@ mod_access_epip='$1' is not a valid partial IP address
 mod_access_emask='$1' is not a valid network/netmask pair
 mod_access_ecidr='$1' is not a valid network/CIDR pair
 mod_access_evar='$1' is not a valid variable name
+core_require_legacy=Legacy Allow/Deny/Order directives were found. Apache 2.4 uses Require rules. Saving this form will replace the legacy directives with the Require rules below.
+core_require_advanced=Advanced authorization containers were found. This form edits a flat set of Require rules with an optional top-level RequireAny or RequireAll block. Saving will replace nested or mixed authorization containers.
+core_require_logic=Authorization logic
+core_require_logic_default=Default flat Require rules
+core_require_logic_any=Any rule may match
+core_require_logic_all=All rules must match
+core_require_type=Rule type
+core_require_value=Value or arguments
+core_require_granted=Allow all requests
+core_require_denied=Deny all requests
+core_require_local=Only local requests
+core_require_ip=Request from IP or network
+core_require_host=Request from host
+core_require_env=If variable is set
+core_require_user=Only these users
+core_require_group=Only these groups
+core_require_validuser=All valid users
+core_require_fileowner=File owner matches
+core_require_filegroup=Group owner matches
+core_require_method=HTTP method
+core_require_expr=Expression
+core_require_other=Raw Require rule
+core_require_etype=You must select a Require rule type
+core_require_evalue=You must enter a value for the selected Require rule
 
 mod_auth_ufile=User text file
 mod_auth_uedit=Edit users

apache/lang/es.auto

@@ -33,7 +33,7 @@ htaccess_err=Error al crear el archivo de opciones
 defines_list=Parámetros definidos
 
 acl_aliasdir=Limite los alias al directorio
-acl_dirs=Directivas de Apache disponibles <br><font size=-1> (Sujeto al límite de tipos anterior) </font>
+acl_dirs=Directivas de Apache disponibles, limitadas por los tipos de directiva seleccionados arriba
 acl_dirs0=Todos
 acl_dirs1=Solo listado ..
 acl_dirs2=Todos excepto los enumerados.

apache/lang/eu.auto

@@ -331,7 +331,7 @@ acl_types=Zuzentarau motak eskuragarri
 acl_all=guztiak
 acl_sel=Hautatutako ..
 acl_names=Editatu al ditzakezu zerbitzariaren izenak?
-acl_dirs=Apache zuzentzaileak eskuragarri daude <font size=-1>(Aurreko muga moten menpe)</font>
+acl_dirs=Eskuragarri dauden Apache zuzentarauak, goian hautatutako zuzentarau motez mugatuta
 acl_dirs0=guztiak
 acl_dirs1=Zerrenda bakarra ..
 acl_dirs2=Zerrendatu guztiak ..

apache/lang/fa.auto

@@ -35,7 +35,7 @@ defines_list=پارامترهای تعریف شده
 
 acl_aliasdir=نام مستعار را به فهرست راهنما محدود كنيد
 acl_names=آیا می توانید نام سرور را ویرایش کنید؟
-acl_dirs=Apache directives available<br><font size=-1>(Subject to types limit above)</font>
+acl_dirs=دستورهای Apache موجود، محدود به انواع دستور انتخاب‌شده در بالا
 acl_dirs0=همه
 acl_dirs1=فقط ذکر شده ..
 acl_dirs2=همه به جز ذکر شده ..

apache/lang/fi.auto

@@ -331,7 +331,7 @@ acl_types=Direktiivityyppejä saatavana
 acl_all=Kaikki
 acl_sel=Valitut ..
 acl_names=Voiko palvelimen nimiä muokata?
-acl_dirs=Apache-direktiivit saatavilla <br><font size=-1> (Ellei tyyppirajoitusta ole yllä) </font>
+acl_dirs=Saatavilla olevat Apache-direktiivit, joita yllä valitut direktiivityypit rajoittavat
 acl_dirs0=Kaikki
 acl_dirs1=Vain listattu ..
 acl_dirs2=Kaikki paitsi luetellut ..

apache/lang/fr

@@ -331,7 +331,7 @@ acl_types=Types de directives disponibles
 acl_all=Tous
 acl_sel=Sélectionnés...
 acl_names=Peut modifier les noms de serveurs?
-acl_dirs=Directives Apache disponibles<br><font size=-1>(assujetties aux limites ci-dessus)</font>
+acl_dirs=Directives Apache disponibles, limitées par les types de directives sélectionnés ci-dessus
 acl_dirs0=Toutes
 acl_dirs1=Seulement les suivantes ...
 acl_dirs2=Toutes sauf les suivantes ...

apache/lang/hr

@@ -322,7 +322,7 @@ acl_types=Tipovi propisa dostupni
 acl_all=Sve
 acl_sel=Odabrano..
 acl_names=Ne možete urediti nazive poslužitelja?
-acl_dirs=Apache propisi dostupni<br><font size=-1>(Mterija tipova limita je iznad)</font>
+acl_dirs=Dostupne Apache direktive, ograničene vrstama direktiva odabranima iznad
 acl_dirs0=Sve
 acl_dirs1=Samo izlistano ..
 acl_dirs2=Sve prihvaćene liste ..

apache/lang/hu.auto

@@ -32,7 +32,7 @@ htaccess_err=Nem sikerült létrehozni az opciós fájlt
 defines_list=Meghatározott paraméterek
 
 acl_aliasdir=Korlátozza az álneveket a könyvtárba
-acl_dirs=Apache-irányelvek elérhetőek <br><font size=-1> (A fenti típuskorlátozástól függően) </font>
+acl_dirs=Elérhető Apache-irányelvek, a fent kiválasztott irányelvtípusok által korlátozva
 acl_dirs0=Összes
 acl_dirs1=Csak felsorolt ..
 acl_dirs2=Minden, kivéve a felsorolt ..

apache/lang/it.auto

@@ -45,7 +45,7 @@ restart_ecannot=Non è consentito applicare modifiche
 acl_apply=È possibile applicare le modifiche?
 acl_aliasdir=Limita gli alias alla directory
 acl_names=Puoi modificare i nomi dei server?
-acl_dirs=Direttive Apache disponibili <br><font size=-1> (Soggetto al limite di tipi sopra) </font>
+acl_dirs=Direttive Apache disponibili, limitate dai tipi di direttiva selezionati sopra
 acl_dirs0=Tutti
 acl_dirs1=Solo elencato ..
 acl_dirs2=Tutti tranne quelli elencati. ..

apache/lang/ja

@@ -322,7 +322,7 @@ acl_types=利用可能なディレクティブのタイプ
 acl_all=すべて
 acl_sel=選択済み..
 acl_names=サーバー名を編集できますか？
-acl_dirs=利用可能なApacheディレクティブ<br> <font size = -1>（上記のタイプ制限に従う）</font>
+acl_dirs=利用可能な Apache ディレクティブ。上で選択したディレクティブタイプに制限されます
 acl_dirs0=All
 acl_dirs1=のみ記載..
 acl_dirs2=All except listed ..

apache/lang/ko.auto

@@ -77,7 +77,7 @@ restart_ecannot=변경 사항을 적용 할 수 없습니다
 acl_apply=변경 사항을 적용 할 수 있습니까?
 acl_aliasdir=디렉토리로 별명 제한
 acl_names=서버 이름을 편집 할 수 있습니까?
-acl_dirs=Apache 지시문 사용 가능 <br><font size=-1> (위의 유형 제한에 따름) </font>
+acl_dirs=사용 가능한 Apache 지시문, 위에서 선택한 지시문 유형으로 제한됨
 acl_dirs0=모두
 acl_dirs1=목록 만 ..
 acl_dirs2=목록을 제외한 모든 ..

apache/lang/ms

@@ -297,7 +297,7 @@ acl_types=Jenis arahan boleh didapati
 acl_all=Semua
 acl_sel=Dipilih ..
 acl_names=Boleh sunting nama pelayan?
-acl_dirs=Arahan Apache yang tersedia <br> <font size=-1> (Tertakluk kepada jenis had seperti diatas) </font>
+acl_dirs=Arahan Apache yang tersedia, dihadkan oleh jenis arahan yang dipilih di atas
 acl_dirs0=Semua
 acl_dirs1=Hanya disenaraikan ..
 acl_dirs2=Semua kecuali yang disenaraikan ..

apache/lang/nl

@@ -328,7 +328,7 @@ acl_types=Beschikbare soorten richtlijnen
 acl_all=Alles
 acl_sel=Geselecteerd..
 acl_names=Mag server namen bewerken?
-acl_dirs=Beschikbare Apache richtlijnen<br><font size=-1>(Behalve de soorten hierboven)</font>
+acl_dirs=Beschikbare Apache-richtlijnen, beperkt door de hierboven geselecteerde richtlijntypen
 acl_dirs0=Alles
 acl_dirs1=Alleen die in de lijst
 acl_dirs2=Alles behalve die in de lijst ..

apache/lang/no

@@ -331,7 +331,7 @@ acl_types=Tilgjengelige direktivtyper
 acl_all=Alle
 acl_sel=Valgte..
 acl_names=Kan redigere tjenernavn?
-acl_dirs=Tilgjengelig Apache direktiver<br><font size=-1>(Med typebegrensninger som angitt ovenfor)</font>
+acl_dirs=Tilgjengelige Apache-direktiver, begrenset av direktivtypene som er valgt ovenfor
 acl_dirs0=Alle
 acl_dirs1=Kun de i listen ..
 acl_dirs2=Alle unntatt de i listen ..

apache/lang/pl

@@ -331,7 +331,7 @@ acl_types=Dostępne typy dyrektyw
 acl_all=Wszystkie
 acl_sel=Wybrane..
 acl_names=Może edytować nazwy serwerów?
-acl_dirs=Dostępne dyrektywy Apache<br><font size=-1>(Zależne od ograniczeń typów powyżej)</font>
+acl_dirs=Dostępne dyrektywy Apache, ograniczone przez wybrane powyżej typy dyrektyw
 acl_dirs0=Wszystkie
 acl_dirs1=Tylko wymienione ..
 acl_dirs2=Wszystkie oprócz wymienionych ..

apache/lang/pt.auto

@@ -120,7 +120,7 @@ acl_defserv=Servidor Padrão
 acl_apply=Pode aplicar alterações?
 acl_aliasdir=Limitar aliases ao diretório
 acl_names=Pode editar nomes de servidores?
-acl_dirs=Diretivas Apache disponíveis <br><font size=-1> (Sujeito ao limite de tipos acima) </font>
+acl_dirs=Diretivas Apache disponíveis, limitadas pelos tipos de diretiva selecionados acima
 acl_dirs0=Todos
 acl_dirs1=Apenas listado ..
 acl_dirs2=Todos, exceto listados ..

apache/lang/pt_BR

@@ -323,7 +323,7 @@ acl_types=Tipos de diretivas disponíveis
 acl_all=Todos
 acl_sel=Selecionados..
 acl_names=Editar nome de servidores?
-acl_dirs=Diretivas do Apache disponíveis<br><font size=-1>(Assunto para os tipos abaixo permitidos)</font>
+acl_dirs=Diretivas do Apache disponíveis, limitadas pelos tipos de diretiva selecionados acima
 acl_dirs0=Todos
 acl_dirs1=Somente listados ..
 acl_dirs2=Todos exceto os listados ..

apache/lang/ru

@@ -318,7 +318,7 @@ acl_types=Доступные типы директив
 acl_all=Все
 acl_sel=Выбранные..
 acl_names=Отредактировать имена серверов?
-acl_dirs=Имеющиеся директивы Apache <br><font size=-1>(С учетом типов ограничить выше) </font>
+acl_dirs=Доступные директивы Apache, ограниченные выбранными выше типами директив
 acl_dirs0=Все
 acl_dirs1=Только перечисленные...
 acl_dirs2=Все, кроме перечисленных...

apache/lang/sk.auto

@@ -331,7 +331,7 @@ acl_types=Dostupné typy smernice
 acl_all=všetko
 acl_sel=Vybraný ..
 acl_names=Môžete upravovať názvy serverov?
-acl_dirs=Dostupné direktívy Apache <br><font size=-1> (podľa obmedzenia typov vyššie) </font>
+acl_dirs=Dostupné direktívy Apache, obmedzené typmi direktív vybranými vyššie
 acl_dirs0=všetko
 acl_dirs1=Iba uvedené ..
 acl_dirs2=Všetky okrem uvedených ..

apache/lang/sv

@@ -323,7 +323,7 @@ acl_types=Tillgängliga direktiv typer
 acl_all=Alla
 acl_sel=Angivna ...
 acl_names=Kan ändra server namn?
-acl_dirs=Apache direktiv tillgängliga<br><font size=-1> (Ämnen av typ begränsning under) </font>
+acl_dirs=Tillgängliga Apache-direktiv, begränsade av de direktivtyper som valts ovan
 acl_dirs0=Alla
 acl_dirs1=Endast listade ..
 acl_dirs2=Alla utom listade ..

apache/lang/tr.auto

@@ -134,7 +134,7 @@ acl_defserv=Varsayılan Sunucu
 acl_apply=Değişiklikler uygulayabilir mi?
 acl_aliasdir=Diğer adları dizine sınırla
 acl_names=Sunucu adlarını düzenleyebilir mi?
-acl_dirs=Apache yönergeleri mevcut <br><font size=-1> (Yukarıdaki tür sınırlamasına tabidir) </font>
+acl_dirs=Kullanılabilir Apache yönergeleri, yukarıda seçilen yönerge türleriyle sınırlıdır
 acl_dirs0=Herşey
 acl_dirs1=Sadece listelenmiş ..
 acl_dirs2=Listelenenler hariç tümü ..

apache/lang/uk.auto

@@ -54,7 +54,7 @@ restart_ecannot=Вам заборонено застосовувати змін
 acl_apply=Чи можна застосувати зміни?
 acl_aliasdir=Обмежте псевдоніми до каталогу
 acl_names=Чи можна редагувати імена серверів?
-acl_dirs=Доступні директиви Apache <br><font size=-1> (За умови обмеження типів вище) </font>
+acl_dirs=Доступні директиви Apache, обмежені вибраними вище типами директив
 acl_dirs0=Усі
 acl_dirs1=Тільки перераховані ..
 acl_dirs2=Усі, крім перерахованих ..

apache/lang/zh

@@ -331,7 +331,7 @@ acl_types=可用的指令类型
 acl_all=全部
 acl_sel=选择的…
 acl_names=是否编辑服务器名称吗
-acl_dirs=Apache指令可用<br><font size=-1>(受上述类型限制)</font>
+acl_dirs=可用的 Apache 指令，受上方所选指令类型限制
 acl_dirs0=全部
 acl_dirs1=仅列出 ..
 acl_dirs2=除列出外的所有内容 ..

apache/lang/zh_TW.auto

@@ -39,7 +39,7 @@ start_eafter=Apache似乎沒有運行
 
 acl_aliasdir=將別名限制為目錄
 acl_names=可以編輯服務器名稱嗎？
-acl_dirs=可用的Apache指令<br><font size=-1>（受上述類型限制）</font>
+acl_dirs=可用的 Apache 指令，受上方所選指令類型限制
 acl_dirs0=所有
 acl_dirs1=只列出 ..
 acl_dirs2=除了列出的所有 ..

apache/mod_access.pl

@@ -4,7 +4,7 @@
 sub mod_access_directives
 {
 local($rv);
-$rv = [ [ 'allow deny order', 1, 4, 'directory htaccess' ] ];
+$rv = [ [ 'allow deny order', 1, 4, 'directory htaccess', '-2.0' ] ];
 return &make_directives($rv, $_[0], "mod_access");
 }
 

apache/mod_auth_digest.pl

@@ -4,7 +4,7 @@
 sub mod_auth_digest_directives
 {
 local($rv);
-$rv = [ [ 'AuthDigestAuthoritative', 0, 4, 'directory htaccess' ],
+$rv = [ [ 'AuthDigestAuthoritative', 0, 4, 'directory htaccess', '-2.4' ],
 	[ 'AuthDigestProvider', 0, 4, 'directory htaccess' ],
 	[ 'AuthDigestAlgorithm', 0, 4, 'directory htaccess' ],
       ];
@@ -38,9 +38,11 @@ return ( $p ? [ join(" ", split(/\0/, $p)) ] : [ ] );
 
 sub edit_AuthDigestAlgorithm
 {
+# MD5-sess is not correctly implemented yet!
+# https://httpd.apache.org/docs/2.4/mod/mod_auth_digest.html#authdigestalgorithm
 return (1, $text{'mod_auth_digest_al'},
        &choice_input($_[0]->{'value'}, "AuthDigestAlgorithm", "",
-       "MD5", "MD5-sess", "$text{'default'},") );
+       "MD5,MD5", "MD5-sess,MD5-sess", "$text{'default'},") );
 }
 sub save_AuthDigestAlgorithm
 {

apache/mod_authz_host.pl

@@ -7,7 +7,7 @@ require 'mod_access.pl';
 sub mod_authz_host_directives
 {
 local($rv);
-$rv = [ [ 'allow deny order', 1, 4, 'directory htaccess' ] ];
+$rv = [ [ 'allow deny order', 1, 4, 'directory htaccess', '2.0-2.4' ] ];
 return &make_directives($rv, $_[0], "mod_authz_host");
 }
 

bin/webmin

@@ -5,21 +5,62 @@
 use strict;
 use warnings;
 BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Color'; }
-use 5.010;
 use Getopt::Long qw(:config no_ignore_case permute pass_through);
-use Term::ANSIColor qw(:constants);
+use Term::ANSIColor qw(color);
 use Pod::Usage;
 
+# %ansi_specs
+# Map logical color names to preferred Term::ANSIColor specs and
+# compatibility fallbacks for older versions.
+my %ansi_specs = (
+	reset         => [ 'reset' ],
+	red           => [ 'red' ],
+	green         => [ 'green' ],
+	yellow        => [ 'yellow' ],
+	cyan          => [ 'cyan' ],
+	dark          => [ 'dark', 'faint' ],
+	bright_red    => [ 'bright_red', 'bold red', 'red' ],
+	bright_green  => [ 'bright_green', 'bold green', 'green' ],
+	bright_yellow => [ 'bright_yellow', 'bold yellow', 'yellow' ],
+);
+my %ansi_cache;
+
+# ansi(name)
+# Resolve a named color to an ANSI escape sequence, with fallbacks
+# for older Term::ANSIColor versions that may not support newer names.
+sub ansi
+{
+my ($name) = @_;
+return $ansi_cache{$name} if (exists $ansi_cache{$name});
+foreach my $spec (@{ $ansi_specs{$name} || [] }) {
+	my $value = eval { color($spec) };
+	return $ansi_cache{$name} = $value if (defined($value));
+	}
+return $ansi_cache{$name} = "";
+}
+
+# print_line(line)
+# Print a full line without relying on Perl's say syntax,
+# which is rejected by some older Perl parsers in this script.
+sub print_line
+{
+print @_;
+print "\n";
+}
+
 # Check if root
 if ($> != 0) {
-	die BRIGHT_RED,
+	die join("",
-		"Error: ", RESET, BRIGHT_YELLOW,"webmin", RESET, 
+		ansi('bright_red'), "Error: ", ansi('reset'),
-		" command must be run as root\n";
+		ansi('bright_yellow'), "webmin", ansi('reset'),
+		" command must be run as root\n");
 	exit 1;
 	}
 
 my $a0 = $ARGV[0];
 
+# main()
+# Parse global options and dispatch the requested Webmin CLI action.
 sub main
 {
 my ( %opt, $subcmd );
@@ -35,7 +76,7 @@ GetOptions(
 		# Handle unrecognized options, inc. subcommands.
 		my($arg) = @_;
 		if ($arg =~ m{^-}) {
-			say "Usage error: Unknown option $arg.";
+			print_line("Usage error: Unknown option $arg.");
 			pod2usage(0);
 			}
 		else {
@@ -93,10 +134,13 @@ elsif ($opt{'version'} || $opt{'versions'}) {
 						"get_module_edition"));
 				$mod_ver .= " $ed" if ($ed);
 				}
-			say CYAN, "  $module_type: ", RESET if (!$head++);
+			print_line(ansi('cyan'), "  $module_type: ",
-			say "    $m->{'desc'}: ", GREEN, $mod_ver, RESET,
+				   ansi('reset')) if (!$head++);
-						  DARK " [$m->{'dir'}]", RESET;
+			print_line("    $m->{'desc'}: ", ansi('green'),
-		}
+				   $mod_ver, ansi('reset'),
+				   ansi('dark'), " [$m->{'dir'}]",
+				   ansi('reset'));
+			}
 	};
 
 	my $root = root($opt{'config'});
@@ -124,18 +168,22 @@ elsif ($opt{'version'} || $opt{'versions'}) {
 		$ver = trim($ver);
 		if ($ver) {
 			if ($opt{'version'}) {
-				say "$ver$verrel";
+				print_line("$ver$verrel");
 				exit 0;
 				}
 			else {
-				say CYAN, "Webmin: ", RESET, GREEN,
+				print_line(ansi('cyan'), "Webmin: ",
-					"$ver$verrel", RESET,
+					   ansi('reset'),
-					DARK " [$root]", RESET;
+					   ansi('green'),
+					   "$ver$verrel", ansi('reset'),
+					   ansi('dark'), " [$root]",
+					   ansi('reset'));
 				}
 			}
 		else {
-			say RED, "Error: ", RESET,
+			print_line(ansi('red'), "Error: ",
-					"Cannot determine Webmin version";
+				   ansi('reset'),
+				   "Cannot determine Webmin version");
 			exit 1;
 			}
 		
@@ -182,7 +230,14 @@ elsif ($opt{'version'} || $opt{'versions'}) {
 					$uverrel = ":@{[trim($uverrel)]}" if ($uverrel);
 					$uver = trim($uver) . $uverrel;
 					if ($uver) {
-						say CYAN, "Usermin: ", RESET, GREEN, $uver, RESET, DARK " [$uroot]", RESET;
+						print_line(ansi('cyan'),
+							   "Usermin: ",
+							   ansi('reset'),
+							   ansi('green'),
+							   $uver, ansi('reset'),
+							   ansi('dark'),
+							   " [$uroot]",
+							   ansi('reset'));
 						my ($udir, @uthemes, @umods);
 						if (opendir($udir, "$uroot")) {
 							while (my $file = readdir($udir)) {
@@ -219,9 +274,9 @@ exit 0;
 }
 exit main( \@ARGV ) if !caller(0);
 
-# run_command - Run a subcommand 
+# run_command(optref, subcmd, remainref)
-# $optref is a reference to an options object passed down from global options
+# Run a subcommand with the resolved Webmin config and pass through
-# like --help or a --config path.
+# its exit status.
 sub run_command
 {
 my ( $optref, $subcmd, $remainref ) = @_;
@@ -234,7 +289,9 @@ my $root = root($optref->{'config'});
 
 my (@commands) = list_commands($optref);
 if (! grep( /^$subcmd$/, @commands ) ) {
-	say RED, "Error: ", RESET, "Command \`$subcmd\` doesn't exist", RESET;
+	print_line(ansi('red'), "Error: ", ansi('reset'),
+		   "Command \`$subcmd\` doesn't exist",
+		   ansi('reset'));
 	exit 1;
 	}
 
@@ -246,7 +303,8 @@ my @allopts = ("--config", "$optref->{'config'}", @$remainref);
 system($command_path, @allopts);
 # Try to exit with the passed through exit code (rarely used, but why not?)
 if ($? == -1) {
-	say RED, "Error: ", RESET, "Failed to execute \`$command_path\`: $!";
+	print_line(ansi('red'), "Error: ", ansi('reset'),
+		   "Failed to execute \`$command_path\`: $!");
 	exit 1;
 	}
 else {
@@ -254,6 +312,9 @@ else {
 	}
 }
 
+# get_command_path(root, subcmd, optref)
+# Resolve a CLI command name to an executable path under Webmin's
+# global or module-specific bin directories.
 sub get_command_path
 {
 my ($root, $subcmd, $optref) = @_;
@@ -306,10 +367,15 @@ elsif ($command) {
 	return $command;
 	}
 else {
-	die RED, "Unrecognized subcommand: $subcmd", RESET , "\n";
+	die join("", ansi('red'),
+		 "Unrecognized subcommand: $subcmd",
+		 ansi('reset'), "\n");
 	}
 }
 
+# list_commands(optref)
+# Enumerate available global and module CLI commands, optionally
+# rendering each command's DESCRIPTION section.
 sub list_commands
 {
 my ($optref) = @_;
@@ -325,7 +391,7 @@ for my $command (glob ("$root/bin/*")) {
 		}
 	if ($optref->{'describe'}) {
 		# Display name and description
-		say YELLOW, "$bin", RESET;
+		print_line(ansi('yellow'), "$bin", ansi('reset'));
 		pod2usage( -verbose => 99,
 				-sections => [ qw(DESCRIPTION) ],
 				-input => $command,
@@ -337,7 +403,7 @@ for my $command (glob ("$root/bin/*")) {
 			}
 		else {
 			# Just list the names
-			say "$bin";
+			print_line("$bin");
 			}
 		}
 	}
@@ -349,11 +415,12 @@ for my $command (glob ("$root/*/bin/*")) {
 	my $module = (split /\//, $path)[-2];
 	if ($optref->{'describe'}) {
 		# Display name and description
-		say YELLOW, "$module-$bin", RESET;
+		print_line(ansi('yellow'), "$module-$bin",
+			   ansi('reset'));
 		pod2usage( -verbose => 99,
-					-sections => [ qw(DESCRIPTION) ],
+				-sections => [ qw(DESCRIPTION) ],
-					-input => $command,
+				-input => $command,
-					-exitval => "NOEXIT");
+				-exitval => "NOEXIT");
 		}
 	else {
 		if (wantarray) {
@@ -361,7 +428,7 @@ for my $command (glob ("$root/*/bin/*")) {
 			}
 		else {
 			# Just list the names
-			say "$module-$bin";
+			print_line("$module-$bin");
 			}
 		}
 	}
@@ -371,7 +438,9 @@ if (wantarray) {
 	}
 }
 
-# Display either a short usage message (--help) or a full manual (--man)
+
+# man_command(optref, subcmd)
+# Display usage message.
 sub man_command
 {
 my ($optref, $subcmd) = @_;
@@ -392,11 +461,15 @@ else {
 close($PAGER);
 }
 
+# root(config)
+# Read the configured Webmin installation root from miniserv.conf.
 sub root
 {
 my ($config) = @_;
 open(my $CONF, "<", "$config/miniserv.conf") ||
-	die RED, "Failed to open $config/miniserv.conf", RESET , "\n";
+	die join("", ansi('red'),
+		 "Failed to open $config/miniserv.conf",
+		 ansi('reset'), "\n");
 my $root;
 while (<$CONF>) {
 	if (/^root=(.*)/) {
@@ -417,10 +490,9 @@ else {
 return $root;
 }
 
-# loadlibs - Load libraries from the Webmin vendor dir
+# loadlibs(optref)
-# as those may not be installed as dependency, because
+# Load bundled libraries from the Webmin vendor dir when they are not
-# Webmin already provides them from package manager
+# available from system package dependencies.
-# perspective.
 sub loadlibs
 {
 my ($optref) = @_;

bind8/acl_security.pl

@@ -11,18 +11,10 @@ our (%config, %text, %in);
 # Output HTML for editing security options for the bind8 module
 sub acl_security_form
 {
-my $m = $_[0]->{'zones'} eq '*' ? 1 :
+my ($o) = @_;
-	   $_[0]->{'zones'} =~ /^\!/ ? 2 : 0;
+my $m = $o->{'zones'} eq '*' ? 1 :
-print "<tr> <td valign=top><b>$text{'acl_zones'}</b></td>\n";
+	   $o->{'zones'} =~ /^\!/ ? 2 : 0;
-print "<td colspan=3><table cellpadding=0 cellspacing=0> <tr><td valign=top>\n";
-printf "<input type=radio name=zones_def value=1 %s> %s<br>\n",
-	$m == 1 ? 'checked' : '', $text{'acl_zall'};
-printf "<input type=radio name=zones_def value=0 %s> %s<br>\n",
-	$m == 0 ? 'checked' : '', $text{'acl_zsel'};
-printf "<input type=radio name=zones_def value=2 %s> %s</td>\n",
-	$m == 2 ? 'checked' : '', $text{'acl_znsel'};
 
-print "<td><select name=zones multiple size=4 width=150>\n";
 my $conf = &get_config();
 my @zones = grep { $_->{'value'} ne "." }
 		    &find("zone", $conf);
@@ -31,188 +23,117 @@ foreach my $v (@views) {
 	push(@zones, grep { $_->{'value'} ne "." }
 			  &find("zone", $v->{'members'}));
 	}
-my %zcan;
+my @zoneopts;
-map { $zcan{$_}++ } split(/\s+/, $_[0]->{'zones'});
 foreach my $z (sort { $a->{'value'} cmp $b->{'value'} } @zones) {
-	printf "<option value='%s' %s>%s</option>\n",
+	push(@zoneopts, [ $z->{'value'}, &arpa_to_ip($z->{'value'}) ]);
-		$z->{'value'},
-		$zcan{$z->{'value'}} ? "selected" : "",
-		&arpa_to_ip($z->{'value'});
 	}
 foreach my $v (sort { $a->{'value'} cmp $b->{'value'} } @views) {
-	printf "<option value='%s' %s>%s</option>\n",
+	push(@zoneopts, [ 'view_'.$v->{'value'},
-		'view_'.$v->{'value'},
+			  &text('acl_inview', $v->{'value'}) ]);
-		$zcan{'view_'.$v->{'value'}} ? "selected" : "",
-		&text('acl_inview', $v->{'value'});
 	}
-print "</select></td> </tr></table></td></tr>\n";
+
+print &ui_table_row($text{'acl_zones'},
+	&ui_radio("zones_def", $m,
+		  [ [ 1, $text{'acl_zall'} ],
+		    [ 0, $text{'acl_zsel'} ],
+		    [ 2, $text{'acl_znsel'} ] ])."<br>\n".
+	&ui_select("zones", [ split(/\s+/, $o->{'zones'}) ], \@zoneopts, 4, 1),
+	3);
 
 if (@views) {
-	print "<tr> <td valign=top><b>$text{'acl_inviews'}</b></td>\n";
+	my @viewopts = [ "_", "&lt;".$text{'acl_toplevel'}."&gt;" ];
-	print "<td colspan=3>\n";
-	print &ui_radio("inviews_def", $_[0]->{'inviews'} eq "*" ? 1 : 0,
-			[ [ 1, $text{'acl_vall'} ],
-			  [ 0, $text{'acl_vsel'} ] ]),"<br>\n";
-	print "<select name=inviews multiple size=4 width=150>\n";
-	my %vcan;
-	map { $vcan{$_}++ } split(/\s+/, $_[0]->{'inviews'});
-	printf "<option value='%s' %s>%s</option>\n",
-		"_", $vcan{"_"} ? "selected" : "",
-		"&lt;".$text{'acl_toplevel'}."&gt;";
 	foreach my $v (sort { $a->{'value'} cmp $b->{'value'} } @views) {
-		printf "<option value='%s' %s>%s</option>\n",
+		push(@viewopts, [ $v->{'value'}, $v->{'value'} ]);
-			$v->{'value'},
-			$vcan{$v->{'value'}} ? "selected" : "", $v->{'value'};
 		}
-	print "</select></td></tr>\n";
+
+	print &ui_table_row($text{'acl_inviews'},
+		&ui_radio("inviews_def", $o->{'inviews'} eq "*" ? 1 : 0,
+			  [ [ 1, $text{'acl_vall'} ],
+			    [ 0, $text{'acl_vsel'} ] ])."<br>\n".
+		&ui_select("inviews", [ split(/\s+/, $o->{'inviews'}) ], \@viewopts,
+			   4, 1),
+		3);
 	}
 
-print "<tr> <td><b>$text{'acl_types'}</b></td> <td colspan=3>\n";
+print &ui_table_row($text{'acl_types'},
-printf "<input type=radio name=types_def value=1 %s> %s\n",
+	&ui_opt_textbox("types", $o->{'types'}, 40,
-	$_[0]->{'types'} ? "" : "checked", $text{'acl_types1'};
+			$text{'acl_types1'}, $text{'acl_types0'}),
-printf "<input type=radio name=types_def value=0 %s> %s\n",
+	3);
-	$_[0]->{'types'} ? "checked" : "", $text{'acl_types0'};
-printf "<input name=types size=40 value='%s'></td> </tr>\n",
-	$_[0]->{'types'};
 
-print "<tr> <td valign=top><b>$text{'acl_dir'}</b></td>\n";
+print &ui_table_row($text{'acl_dir'},
-printf "<td colspan=3><input name=dir size=30 value='%s'> %s<br>\n",
+	&ui_textbox("dir", $o->{'dir'}, 30)." ".&file_chooser_button("dir", 1).
-	$_[0]->{'dir'}, &file_chooser_button("dir", 1);
+	"<br>\n".&ui_checkbox("dironly", 1, $text{'acl_dironly'}, $o->{'dironly'}),
-printf "<input type=checkbox name=dironly value=1 %s> %s</td> </tr>\n",
+	3);
-	$_[0]->{'dironly'} ? "checked" : "", $text{'acl_dironly'};
 
-print "<tr> <td><b>$text{'acl_defaults'}</b></td> <td nowrap>\n";
+print &ui_table_row($text{'acl_defaults'},
-printf "<input type=radio name=defaults value=1 %s> $text{'yes'}\n",
+	&ui_yesno_radio("defaults", $o->{'defaults'}));
-	$_[0]->{'defaults'} ? "checked" : "";
-printf "<input type=radio name=defaults value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'defaults'} ? "" : "checked";
 
-print "<tr> <td><b>$text{'acl_ztypes'}</b></td> <td colspan=3>\n";
+print &ui_table_row($text{'acl_ztypes'},
-foreach my $t ("master", "slave", "forward", "delegation") {
+	join("", map { &ui_checkbox($_, 1, $text{'acl_ztypes_'.$_}, $o->{$_}) }
-	printf "<input type=checkbox name=%s %s> %s\n",
+		    ("master", "slave", "forward", "delegation")),
-		$t, $_[0]->{$t} ? "checked" : "", $text{'acl_ztypes_'.$t};
+	3);
-	}
-print "</td> </tr>\n";
 
-print "<tr> <td><b>$text{'acl_reverse'}</b></td> <td nowrap>\n";
+print &ui_table_row($text{'acl_reverse'},
-printf "<input type=radio name=reverse value=1 %s> $text{'yes'}\n",
+	&ui_yesno_radio("reverse", $o->{'reverse'}));
-	$_[0]->{'reverse'} ? "checked" : "";
+print &ui_table_row($text{'acl_multiple'},
-printf "<input type=radio name=reverse value=0 %s> $text{'no'}</td>\n",
+	&ui_yesno_radio("multiple", $o->{'multiple'}));
-	$_[0]->{'reverse'} ? "" : "checked";
 
-print "<td><b>$text{'acl_multiple'}</b></td> <td nowrap>\n";
+print &ui_table_row($text{'acl_ro'},
-printf "<input type=radio name=multiple value=1 %s> $text{'yes'}\n",
+	&ui_yesno_radio("ro", $o->{'ro'}));
-	$_[0]->{'multiple'} ? "checked" : "";
+print &ui_table_row($text{'acl_apply'},
-printf "<input type=radio name=multiple value=0 %s> $text{'no'}</td> </tr>\n",
+	&ui_select("apply",
-	$_[0]->{'multiple'} ? "" : "checked";
+		   defined($o->{'apply'}) && $o->{'apply'} ne '' ? $o->{'apply'} : 0,
+		   [ [ 1, $text{'yes'} ],
+		     [ 2, $text{'acl_applyonly'} ],
+		     [ 3, $text{'acl_applygonly'} ],
+		     [ 0, $text{'no'} ] ]));
 
-print "<tr> <td><b>$text{'acl_ro'}</b></td> <td nowrap>\n";
+print &ui_table_row($text{'acl_file'},
-printf "<input type=radio name=ro value=1 %s> $text{'yes'}\n",
+	&ui_yesno_radio("file", $o->{'file'}));
-	$_[0]->{'ro'} ? "checked" : "";
+print &ui_table_row($text{'acl_params'},
-printf "<input type=radio name=ro value=0 %s> $text{'no'}</td>\n",
+	&ui_yesno_radio("params", $o->{'params'}));
-	$_[0]->{'ro'} ? "" : "checked";
 
-print "<td><b>$text{'acl_apply'}</b></td> <td nowrap>\n";
+print &ui_table_row($text{'acl_opts'},
-print &ui_select("apply", $_[0]->{'apply'},
+	&ui_yesno_radio("opts", $o->{'opts'}));
-		[ [ 1, $text{'yes'} ],
+print &ui_table_row($text{'acl_delete'},
-		  [ 2, $text{'acl_applyonly'} ],
+	&ui_yesno_radio("delete", $o->{'delete'}));
-		  [ 3, $text{'acl_applygonly'} ],
-		  [ 0, $text{'no'} ] ]),"</td> </tr>\n";
 
-print "<tr> <td><b>$text{'acl_file'}</b></td> <td nowrap>\n";
+print &ui_table_row($text{'acl_gen'},
-printf "<input type=radio name=file value=1 %s> $text{'yes'}\n",
+	&ui_yesno_radio("gen", $o->{'gen'}));
-	$_[0]->{'file'} ? "checked" : "";
+print &ui_table_row($text{'acl_whois'},
-printf "<input type=radio name=file value=0 %s> $text{'no'}</td>\n",
+	&ui_yesno_radio("whois", $o->{'whois'}));
-	$_[0]->{'file'} ? "" : "checked";
 
-print "<td><b>$text{'acl_params'}</b></td> <td nowrap>\n";
+print &ui_table_row($text{'acl_findfree'},
-printf "<input type=radio name=params value=1 %s> $text{'yes'}\n",
+	&ui_yesno_radio("findfree", $o->{'findfree'}));
-	$_[0]->{'params'} ? "checked" : "";
+print &ui_table_row($text{'acl_remote'},
-printf "<input type=radio name=params value=0 %s> $text{'no'}</td> </tr>\n",
+	&ui_yesno_radio("remote", $o->{'remote'}));
-	$_[0]->{'params'} ? "" : "checked";
 
-print "<tr> <td><b>$text{'acl_opts'}</b></td> <td nowrap>\n";
+print &ui_table_row($text{'acl_slaves'},
-printf "<input type=radio name=opts value=1 %s> $text{'yes'}\n",
+	&ui_yesno_radio("slaves", $o->{'slaves'}));
-	$_[0]->{'opts'} ? "checked" : "";
+print &ui_table_row($text{'acl_dnssec'},
-printf "<input type=radio name=opts value=0 %s> $text{'no'}</td>\n",
+	&ui_yesno_radio("dnssec", $o->{'dnssec'}));
-	$_[0]->{'opts'} ? "" : "checked";
 
-print "<td><b>$text{'acl_delete'}</b></td> <td nowrap>\n";
+print &ui_table_row($text{'acl_views'},
-printf "<input type=radio name=delete value=1 %s> $text{'yes'}\n",
+	&ui_radio("views", defined($o->{'views'}) ? $o->{'views'} : 0,
-	$_[0]->{'delete'} ? "checked" : "";
+		  [ [ 1, $text{'yes'} ],
-printf "<input type=radio name=delete value=0 %s> $text{'no'}</td> </tr>\n",
+		    [ 2, $text{'acl_edonly'} ],
-	$_[0]->{'delete'} ? "" : "checked";
+		    [ 0, $text{'no'} ] ]),
-
+	3);
-print "<tr> <td><b>$text{'acl_gen'}</b></td> <td nowrap>\n";
-printf "<input type=radio name=gen value=1 %s> $text{'yes'}\n",
-	$_[0]->{'gen'} ? "checked" : "";
-printf "<input type=radio name=gen value=0 %s> $text{'no'}</td>\n",
-	$_[0]->{'gen'} ? "" : "checked";
-
-print "<td><b>$text{'acl_whois'}</b></td> <td nowrap>\n";
-printf "<input type=radio name=whois value=1 %s> $text{'yes'}\n",
-	$_[0]->{'whois'} ? "checked" : "";
-printf "<input type=radio name=whois value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'whois'} ? "" : "checked";
-
-print "<tr> <td><b>$text{'acl_findfree'}</b></td> <td nowrap>\n";
-printf "<input type=radio name=findfree value=1 %s> $text{'yes'}\n",
-	$_[0]->{'findfree'} ? "checked" : "";
-printf "<input type=radio name=findfree value=0 %s> $text{'no'}</td>\n",
-	$_[0]->{'findfree'} ? "" : "checked";
-
-print "<td><b>$text{'acl_remote'}</b></td> <td nowrap>\n";
-printf "<input type=radio name=remote value=1 %s> $text{'yes'}\n",
-	$_[0]->{'remote'} ? "checked" : "";
-printf "<input type=radio name=remote value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'remote'} ? "" : "checked";
-
-print "<tr> <td><b>$text{'acl_slaves'}</b></td> <td nowrap>\n";
-printf "<input type=radio name=slaves value=1 %s> $text{'yes'}\n",
-	$_[0]->{'slaves'} ? "checked" : "";
-printf "<input type=radio name=slaves value=0 %s> $text{'no'}</td>\n",
-	$_[0]->{'slaves'} ? "" : "checked";
-
-print "<td><b>$text{'acl_dnssec'}</b></td> <td nowrap>\n";
-printf "<input type=radio name=dnssec value=1 %s> $text{'yes'}\n",
-	$_[0]->{'dnssec'} ? "checked" : "";
-printf "<input type=radio name=dnssec value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'dnssec'} ? "" : "checked";
-
-print "</tr>\n";
-
-print "<tr> <td><b>$text{'acl_views'}</b></td> <td colspan=3>\n";
-printf "<input type=radio name=views value=1 %s> $text{'yes'}\n",
-	$_[0]->{'views'} == 1 ? "checked" : "";
-printf "<input type=radio name=views value=2 %s> $text{'acl_edonly'}\n",
-	$_[0]->{'views'} == 2 ? "checked" : "";
-printf "<input type=radio name=views value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'views'} ? "" : "checked";
 
 if (@views) {
-	my $m = $_[0]->{'vlist'} eq '*' ? 1 :
+	my $vm = $o->{'vlist'} eq '*' ? 1 :
-		   $_[0]->{'vlist'} =~ /^\!/ ? 2 :
+		 $o->{'vlist'} =~ /^\!/ ? 2 :
-		   $_[0]->{'vlist'} eq '' ? 3 : 0;
+		 $o->{'vlist'} eq '' ? 3 : 0;
-	print "<tr> <td valign=top><b>$text{'acl_vlist'}</b></td>\n";
+	my @vopts = map { [ $_->{'value'}, $_->{'value'} ] }
-	print "<td colspan=3><table cellpadding=0 cellspacing=0> <tr><td valign=top>\n";
+		    sort { $a->{'value'} cmp $b->{'value'} } @views;
-	printf "<input type=radio name=vlist_def value=1 %s> %s<br>\n",
+	print &ui_table_row($text{'acl_vlist'},
-		$m == 1 ? 'checked' : '', $text{'acl_vall'};
+		&ui_radio("vlist_def", $vm,
-	printf "<input type=radio name=vlist_def value=0 %s> %s<br>\n",
+			  [ [ 1, $text{'acl_vall'} ],
-		$m == 0 ? 'checked' : '', $text{'acl_vsel'};
+			    [ 0, $text{'acl_vsel'} ],
-	printf "<input type=radio name=vlist_def value=2 %s> %s<br>\n",
+			    [ 2, $text{'acl_vnsel'} ],
-		$m == 2 ? 'checked' : '', $text{'acl_vnsel'};
+			    [ 3, $text{'acl_vnone'} ] ])."<br>\n".
-	printf "<input type=radio name=vlist_def value=3 %s> %s</td>\n",
+		&ui_select("vlist", [ split(/\s+/, $o->{'vlist'}) ], \@vopts, 4, 1),
-		$m == 3 ? 'checked' : '', $text{'acl_vnone'};
+		3);
-
-	print "<td><select name=vlist multiple size=4 width=150>\n";
-	my ($v, %vcan);
-	map { $vcan{$_}++ } split(/\s+/, $_[0]->{'vlist'});
-	foreach my $v (sort { $a->{'value'} cmp $b->{'value'} } @views) {
-		printf "<option value='%s' %s>%s</option>\n",
-			$v->{'value'},
-			$vcan{$v->{'value'}} ? "selected" : "", $v->{'value'};
-		}
-	print "</select></td> </tr></table></td></tr>\n";
 	}
 }
 

cluster-passwd/acl_security.pl

@@ -5,66 +5,47 @@ require 'cluster-passwd-lib.pl';
 # Output HTML for editing security options for the passwd module
 sub acl_security_form
 {
-print "<tr> <td valign=top><b>$passwd::text{'acl_users'}</b></td> <td colspan=3>\n";
+my ($o) = @_;
-printf "<input type=radio name=mode value=0 %s> %s\n",
-	$_[0]->{'mode'} == 0 ? 'checked' : '', $passwd::text{'acl_mode0'};
 
-printf "<input type=radio name=mode value=3 %s> %s<br>\n",
+print &ui_table_row($passwd::text{'acl_users'},
-	$_[0]->{'mode'} == 3 ? 'checked' : '', $passwd::text{'acl_mode3'};
+	&ui_radio_table("mode", defined($o->{'mode'}) ? $o->{'mode'} : 0,
+		[ [ 0, $passwd::text{'acl_mode0'} ],
+		  [ 3, $passwd::text{'acl_mode3'} ],
+		  [ 1, $passwd::text{'acl_mode1'},
+		    &ui_textbox("users1", $o->{'mode'} == 1 ? $o->{'users'} : "",
+				40)." ".&user_chooser_button("users1", 1) ],
+		  [ 2, $passwd::text{'acl_mode2'},
+		    &ui_textbox("users2", $o->{'mode'} == 2 ? $o->{'users'} : "",
+				40)." ".&user_chooser_button("users2", 1) ],
+		  [ 4, $passwd::text{'acl_mode4'},
+		    &ui_textbox("low", $o->{'mode'} == 4 ? $o->{'low'} : "", 8).
+		    " - ".&ui_textbox("high",
+				      $o->{'mode'} == 4 ? $o->{'high'} : "", 8) ],
+		  [ 5, $passwd::text{'acl_mode5'},
+		    &ui_textbox("groups", $o->{'mode'} == 5 ? $o->{'users'} : "",
+				20)." ".&group_chooser_button("groups", 1)."<br>\n".
+		    &ui_checkbox("sec", 1, $passwd::text{'acl_sec'}, $o->{'sec'}) ],
+		  [ 6, $passwd::text{'acl_mode6'},
+		    &ui_textbox("match", $o->{'mode'} == 6 ? $o->{'users'} : "",
+				15) ] ], 1),
+		3);
 
-printf "<input type=radio name=mode value=1 %s> %s\n",
+print &ui_table_row($passwd::text{'acl_repeat'},
-	$_[0]->{'mode'} == 1 ? 'checked' : '', $passwd::text{'acl_mode1'};
+	&ui_yesno_radio("repeat", $o->{'repeat'}), 3);
-printf "<input name=users1 size=40 value='%s'> %s<br>\n",
-	$_[0]->{'mode'} == 1 ? $_[0]->{'users'} : '',
-	&user_chooser_button("users1", 1);
 
-printf "<input type=radio name=mode value=2 %s> %s\n",
+print &ui_table_row($passwd::text{'acl_others'},
-	$_[0]->{'mode'} == 2 ? 'checked' : '', $passwd::text{'acl_mode2'};
+	&ui_radio("others", defined($o->{'others'}) ? $o->{'others'} : 0,
-printf "<input name=users2 size=40 value='%s'> %s<br>\n",
+		  [ [ 1, $passwd::text{'yes'} ],
-	$_[0]->{'mode'} == 2 ? $_[0]->{'users'} : '',
+		    [ 2, $passwd::text{'acl_opt'} ],
-	&user_chooser_button("users2", 1);
+		    [ 0, $passwd::text{'no'} ] ]),
+	3);
 
-printf "<input type=radio name=mode value=4 %s> %s\n",
+print &ui_table_row($passwd::text{'acl_old'},
-	$_[0]->{'mode'} == 4 ? 'checked' : '', $passwd::text{'acl_mode4'};
+	&ui_radio("old", defined($o->{'old'}) ? $o->{'old'} : 0,
-printf "<input name=low size=8 value='%s'> -\n",
+		  [ [ 1, $passwd::text{'yes'} ],
-	$_[0]->{'mode'} == 4 ? $_[0]->{'low'} : '';
+		    [ 2, $passwd::text{'acl_old_this'} ],
-printf "<input name=high size=8 value='%s'><br>\n",
+		    [ 0, $passwd::text{'no'} ] ]),
-	$_[0]->{'mode'} == 4 ? $_[0]->{'high'} : '';
+	3);
-
-printf "<input type=radio name=mode value=5 %s> %s\n",
-	$_[0]->{'mode'} == 5 ? 'checked' : '', $passwd::text{'acl_mode5'};
-printf "<input name=groups size=20 value='%s'> %s<br>\n",
-	$_[0]->{'mode'} == 5 ? $_[0]->{'users'} : '',
-	&group_chooser_button("groups", 1);
-printf "%s <input type=checkbox name=sec value=1 %s> %s<br>\n",
-        "&nbsp;" x 5, $_[0]->{'sec'} ? 'checked' : '',$passwd::text{'acl_sec'};
-
-printf "<input type=radio name=mode value=6 %s> %s\n",
-	$_[0]->{'mode'} == 6 ? 'checked' : '', $passwd::text{'acl_mode6'};
-printf "<input name=match size=15 value='%s'></td> </tr>\n",
-	$_[0]->{'mode'} == 6 ? $_[0]->{'users'} : '';
-
-print "<tr> <td><b>$passwd::text{'acl_repeat'}</b></td> <td colspan=3>\n";
-printf "<input type=radio name=repeat value=1 %s> $passwd::text{'yes'}\n",
-	$_[0]->{'repeat'} ? "checked" : "";
-printf "<input type=radio name=repeat value=0 %s> $passwd::text{'no'}</td> </tr>\n",
-	$_[0]->{'repeat'} ? "" : "checked";
-
-print "<td><b>$passwd::text{'acl_others'}</b></td> <td colspan=3>\n";
-printf "<input type=radio name=others value=1 %s> $passwd::text{'yes'}\n",
-	$_[0]->{'others'} == 1 ? "checked" : "";
-printf "<input type=radio name=others value=2 %s> $passwd::text{'acl_opt'}\n",
-	$_[0]->{'others'} == 2 ? "checked" : "";
-printf "<input type=radio name=others value=0 %s> $passwd::text{'no'}</td> </tr>\n",
-	$_[0]->{'others'} == 0 ? "checked" : "";
-
-print "<tr> <td><b>$passwd::text{'acl_old'}</b></td> <td colspan=3>\n";
-printf "<input type=radio name=old value=1 %s> $passwd::text{'yes'}\n",
-	$_[0]->{'old'} == 1 ? "checked" : "";
-printf "<input type=radio name=old value=2 %s> $passwd::text{'acl_old_this'}\n",
-	$_[0]->{'old'} == 2 ? "checked" : "";
-printf "<input type=radio name=old value=0 %s> $passwd::text{'no'}</td> </tr>\n",
-	$_[0]->{'old'} == 0 ? "checked" : "";
 }
 
 # acl_security_save(&options)

cluster-usermin/lang/ar.auto

@@ -34,7 +34,7 @@ index_installon=التثبيت على
 index_upgradeon=خوادم للترقية
 index_update=وحدات التحديث
 index_updateon=خوادم لتحديث
-index_updatedesc=يسمح لك هذا النموذج بترقية وحدات Usermin التي تبين أنها تحتوي على أخطاء أو ثغرات أمنية من صفحة <a href=http://www.webmin.com/updates.html>تحديثات Usermin</a> أو من مصدر آخر.
+index_updatedesc=يسمح لك هذا النموذج بترقية وحدات Usermin التي تبين أنها تحتوي على أخطاء أو ثغرات أمنية من صفحة <a href=https://webmin.com/updates.html>تحديثات Usermin</a> أو من مصدر آخر.
 index_thost=اسم المضيف
 index_tdesc=وصف
 index_tver=الإصدار

cluster-usermin/lang/bg.auto

@@ -34,7 +34,7 @@ index_installon=Инсталиране на
 index_upgradeon=Сървъри за надграждане
 index_update=Актуализиране на модули
 index_updateon=Сървъри за актуализация
-index_updatedesc=Този формуляр ви позволява да надстроите Usermin модули, за които е установено, че съдържат грешки или дупки за сигурност от страницата <a href=http://www.webmin.com/updates.html>Usermin Updates</a> или от друг източник.
+index_updatedesc=Този формуляр ви позволява да надстроите Usermin модули, за които е установено, че съдържат грешки или дупки за сигурност от страницата <a href=https://webmin.com/updates.html>Usermin Updates</a> или от друг източник.
 index_thost=Име на хост
 index_tdesc=описание
 index_tver=версия

cluster-usermin/lang/ca

@@ -34,7 +34,7 @@ index_installon=Instal·la a
 index_upgradeon=Servidors a actualitzar
 index_update=Actualitza Mòduls
 index_updateon=Servidors a actualitzar
-index_updatedesc=Aquest formulari permet actualitzar els mòduls d'Usermin que tenen errors o forats de seguretat a partir de la pàgina d'<a href=http://www.webmin.com/updates.html>Actualitzacions d'Usermin</a> o des d'una altra font.
+index_updatedesc=Aquest formulari permet actualitzar els mòduls d'Usermin que tenen errors o forats de seguretat a partir de la pàgina d'<a href=https://webmin.com/updates.html>Actualitzacions d'Usermin</a> o des d'una altra font.
 index_thost=Nom de host
 index_tdesc=Descripció
 index_tver=Versió

cluster-usermin/lang/cs

@@ -34,7 +34,7 @@ index_installon=Instalovat na
 index_upgradeon=Servery k povýšení
 index_update=Povýšení modulů
 index_updateon=Servery k povýšení
-index_updatedesc=Tento formulář umožní aktualizovat moduly Userminu, které obsahují chyby nebo bezpečnostní trhliny ze stránky <a href=http://www.webmin.com/updates.html>Aktualizace Userminu</a> nebo z jiného zdroje.
+index_updatedesc=Tento formulář umožní aktualizovat moduly Userminu, které obsahují chyby nebo bezpečnostní trhliny ze stránky <a href=https://webmin.com/updates.html>Aktualizace Userminu</a> nebo z jiného zdroje.
 index_thost=Jméno počítače
 index_tdesc=Poznámka
 index_tver=Verze

cluster-usermin/lang/da.auto

@@ -34,7 +34,7 @@ index_installon=Installer på
 index_upgradeon=Servere, der skal opgraderes
 index_update=Opdater moduler
 index_updateon=Servere, der skal opdateres
-index_updatedesc=Denne formular giver dig mulighed for at opgradere Usermin-moduler, der har vist sig at indeholde fejl eller sikkerhedshuller fra siden <a href=http://www.webmin.com/updates.html>Usermin Updates</a> eller fra en anden kilde.
+index_updatedesc=Denne formular giver dig mulighed for at opgradere Usermin-moduler, der har vist sig at indeholde fejl eller sikkerhedshuller fra siden <a href=https://webmin.com/updates.html>Usermin Updates</a> eller fra en anden kilde.
 index_thost=Værtsnavn
 index_tdesc=Beskrivelse
 index_tver=Version

cluster-usermin/lang/de

@@ -34,7 +34,7 @@ index_installon=Installieren auf
 index_upgradeon=Zu aktualisierende Server
 index_update=Module aktualisieren
 index_updateon=Zu aktualisierende Server
-index_updatedesc=Dieses Formular ermöglicht es Ihnen, Usermin-Module zu aktualisieren, die Fehler oder Sicherheitslücken enthalten. Weitere Informationen finden Sie auf der <a href=http://www.webmin.com/updates.html>Usermin Updates</a>-Seite oder von einer anderen Quelle.
+index_updatedesc=Dieses Formular ermöglicht es Ihnen, Usermin-Module zu aktualisieren, die Fehler oder Sicherheitslücken enthalten. Weitere Informationen finden Sie auf der <a href=https://webmin.com/updates.html>Usermin Updates</a>-Seite oder von einer anderen Quelle.
 index_thost=Hostname
 index_tdesc=Beschreibung
 index_tver=Version

cluster-usermin/lang/el.auto

@@ -34,7 +34,7 @@ index_installon=Εγκαταστήστε το
 index_upgradeon=Διακομιστές για αναβάθμιση
 index_update=Ενημερώστε τις ενότητες
 index_updateon=Οι διακομιστές για ενημέρωση
-index_updatedesc=Αυτή η φόρμα σάς επιτρέπει να αναβαθμίσετε τις ενότητες Usermin που έχουν βρεθεί ότι περιέχουν σφάλματα ή τρύπες ασφαλείας από τη σελίδα <a href=http://www.webmin.com/updates.html>Usermin Updates</a> ή από άλλη πηγή.
+index_updatedesc=Αυτή η φόρμα σάς επιτρέπει να αναβαθμίσετε τις ενότητες Usermin που έχουν βρεθεί ότι περιέχουν σφάλματα ή τρύπες ασφαλείας από τη σελίδα <a href=https://webmin.com/updates.html>Usermin Updates</a> ή από άλλη πηγή.
 index_thost=Όνομα κεντρικού υπολογιστή
 index_tdesc=Περιγραφή
 index_tver=Εκδοχή

cluster-usermin/lang/en

@@ -34,7 +34,7 @@ index_installon=Install on
 index_upgradeon=Servers to upgrade
 index_update=Update Modules
 index_updateon=Servers to update
-index_updatedesc=This form allows you to upgrade Usermin modules that have been found to contain bugs or security holes from the <a href=http://www.webmin.com/updates.html>Usermin Updates</a> page or from another source.
+index_updatedesc=This form allows you to upgrade Usermin modules that have been found to contain bugs or security holes from the <a href=https://webmin.com/updates.html>Usermin Updates</a> page or from another source.
 index_thost=Hostname
 index_tdesc=Description
 index_tver=Version

cluster-usermin/lang/es.auto

@@ -34,7 +34,7 @@ index_installon=Instalar en
 index_upgradeon=Servidores para actualizar
 index_update=Actualizar módulos
 index_updateon=Servidores para actualizar
-index_updatedesc=Este formulario le permite actualizar los módulos de Usermin que contienen errores o agujeros de seguridad desde la página <a href=http://www.webmin.com/updates.html>Actualizaciones de Usermin</a> o desde otra fuente.
+index_updatedesc=Este formulario le permite actualizar los módulos de Usermin que contienen errores o agujeros de seguridad desde la página <a href=https://webmin.com/updates.html>Actualizaciones de Usermin</a> o desde otra fuente.
 index_thost=Nombre de host
 index_tdesc=Descripción
 index_tver=Versión

cluster-usermin/lang/eu.auto

@@ -34,7 +34,7 @@ index_installon=Instalatu martxan
 index_upgradeon=Zerbitzariak bertsio berritzeko
 index_update=Eguneratzeko moduluak
 index_updateon=Zerbitzariak eguneratzeko
-index_updatedesc=Inprimaki honek <a href=http://www.webmin.com/updates.html>Usermin Eguneratzeak</a> orrialdetik akatsak edo segurtasun zuloak aurkitu dituzten Usermin moduluak berritzea ahalbidetzen du.
+index_updatedesc=Inprimaki honek <a href=https://webmin.com/updates.html>Usermin Eguneratzeak</a> orrialdetik akatsak edo segurtasun zuloak aurkitu dituzten Usermin moduluak berritzea ahalbidetzen du.
 index_thost=hostname
 index_tdesc=deskribapena
 index_tver=Bertsio

cluster-usermin/lang/fa.auto

@@ -34,7 +34,7 @@ index_installon=نصب کنید
 index_upgradeon=سرورهای به روزرسانی
 index_update=ماژول ها را به روز کنید
 index_updateon=سرورها برای بروزرسانی
-index_updatedesc=این فرم به شما امکان می دهد ماژول های Usermin را که پیدا شده است شامل اشکالات یا حفره های امنیتی از <a href=http://www.webmin.com/updates.html>Usermin Updates</a> یا از منبع دیگری باشد ، به روز کنید.
+index_updatedesc=این فرم به شما امکان می دهد ماژول های Usermin را که پیدا شده است شامل اشکالات یا حفره های امنیتی از <a href=https://webmin.com/updates.html>Usermin Updates</a> یا از منبع دیگری باشد ، به روز کنید.
 index_thost=نام میزبان
 index_tdesc=شرح
 index_tver=نسخه

cluster-usermin/lang/fi.auto

@@ -34,7 +34,7 @@ index_installon=Asenna päälle
 index_upgradeon=Päivitettävät palvelimet
 index_update=Päivitä moduulit
 index_updateon=Päivitettävät palvelimet
-index_updatedesc=Tämä lomake antaa sinun päivittää Usermin-moduuleja, joiden on havaittu sisältävän virheitä tai <a href=http://www.webmin.com/updates.html>Usermin Updates</a> -sivulta tai muusta lähteestä.
+index_updatedesc=Tämä lomake antaa sinun päivittää Usermin-moduuleja, joiden on havaittu sisältävän virheitä tai <a href=https://webmin.com/updates.html>Usermin Updates</a> -sivulta tai muusta lähteestä.
 index_thost=hostname
 index_tdesc=Kuvaus
 index_tver=Versio

cluster-usermin/lang/fr

@@ -34,7 +34,7 @@ index_installon=Installer sur
 index_upgradeon=Serveurs à mettre à niveau
 index_update=Modules de mise à jour
 index_updateon=Serveurs à mettre à jour
-index_updatedesc=Ce formulaire vous permet de mettre à niveau les modules Usermin qui se sont révélés contenir des bogues ou des failles de sécurité à partir de la page <a href=http://www.webmin.com/updates.html>Mises à jour Usermin</a> ou à partir d'une autre source.
+index_updatedesc=Ce formulaire vous permet de mettre à niveau les modules Usermin qui se sont révélés contenir des bogues ou des failles de sécurité à partir de la page <a href=https://webmin.com/updates.html>Mises à jour Usermin</a> ou à partir d'une autre source.
 index_thost=Nom d'hôte
 index_tdesc=La description
 index_tver=Version

cluster-usermin/lang/hr

@@ -34,7 +34,7 @@ index_installon=Instaliraj na
 index_upgradeon=Poslužitelji za nadogradnju
 index_update=Nadopunjeni Moduli
 index_updateon=Poslužitelji za nadopunu
-index_updatedesc=Ova forma Vam dopušta da nadogradite Usermin module za koje je utvđeno da sadrže greške ili propuste u sigurnosti iz <a href=http://www.webmin.com/updates.html>Usermin Nadopune</a> stranice ili iz nekog drugog izvora.
+index_updatedesc=Ova forma Vam dopušta da nadogradite Usermin module za koje je utvđeno da sadrže greške ili propuste u sigurnosti iz <a href=https://webmin.com/updates.html>Usermin Nadopune</a> stranice ili iz nekog drugog izvora.
 
 this_server=ovaj poslužitelj
 

cluster-usermin/lang/hu

@@ -34,7 +34,7 @@ index_installon=Install on
 index_upgradeon=Servers to upgrade
 index_update=Update Modules
 index_updateon=Servers to update
-index_updatedesc=This form allows you to upgrade Usermin modules that have been found to contain bugs or security holes from the <a href=http://www.webmin.com/updates.html>Usermin Updates</a> page or from another source.
+index_updatedesc=This form allows you to upgrade Usermin modules that have been found to contain bugs or security holes from the <a href=https://webmin.com/updates.html>Usermin Updates</a> page or from another source.
 index_thost=Hostname
 index_tdesc=Description
 index_tver=Version

cluster-usermin/lang/it.auto

@@ -34,7 +34,7 @@ index_installon=Installa su
 index_upgradeon=Server da aggiornare
 index_update=Moduli di aggiornamento
 index_updateon=Server da aggiornare
-index_updatedesc=Questo modulo consente di aggiornare i moduli Usermin che sono stati trovati contenere bug o falle di sicurezza dalla pagina <a href=http://www.webmin.com/updates.html>Aggiornamenti Usermin</a> o da un'altra fonte.
+index_updatedesc=Questo modulo consente di aggiornare i moduli Usermin che sono stati trovati contenere bug o falle di sicurezza dalla pagina <a href=https://webmin.com/updates.html>Aggiornamenti Usermin</a> o da un'altra fonte.
 index_thost=Nome host
 index_tdesc=Descrizione
 index_tver=Versione

cluster-usermin/lang/ja.auto

@@ -34,7 +34,7 @@ index_installon=にインストール
 index_upgradeon=アップグレードするサーバー
 index_update=更新モジュール
 index_updateon=更新するサーバー
-index_updatedesc=このフォームを使用すると、<a href=http://www.webmin.com/updates.html>Usermin Updates</a>ページまたは別のソースからバグまたはセキュリティホールが見つかったUserminモジュールをアップグレードできます。
+index_updatedesc=このフォームを使用すると、<a href=https://webmin.com/updates.html>Usermin Updates</a>ページまたは別のソースからバグまたはセキュリティホールが見つかったUserminモジュールをアップグレードできます。
 index_thost=ホスト名
 index_tdesc=説明
 index_tver=バージョン

cluster-usermin/lang/ko.auto

@@ -34,7 +34,7 @@ index_installon=에 설치
 index_upgradeon=업그레이드 할 서버
 index_update=업데이트 모듈
 index_updateon=업데이트 할 서버
-index_updatedesc=이 양식을 사용하면 <a href=http://www.webmin.com/updates.html>Usermin 업데이트</a> 페이지 또는 다른 소스에서 버그 나 보안 허점이있는 것으로 밝혀진 Usermin 모듈을 업그레이드 할 수 있습니다.
+index_updatedesc=이 양식을 사용하면 <a href=https://webmin.com/updates.html>Usermin 업데이트</a> 페이지 또는 다른 소스에서 버그 나 보안 허점이있는 것으로 밝혀진 Usermin 모듈을 업그레이드 할 수 있습니다.
 index_thost=호스트 이름
 index_tdesc=기술
 index_tver=버전

cluster-usermin/lang/ms.auto

@@ -34,7 +34,7 @@ index_installon=Pasang pada
 index_upgradeon=Pelayan untuk menaik taraf
 index_update=Kemas kini Modul
 index_updateon=Pelayan untuk mengemaskini
-index_updatedesc=Borang ini membolehkan anda menaik taraf modul Usermin yang didapati mengandungi pepijat atau lubang keselamatan dari halaman <a href=http://www.webmin.com/updates.html>Kemas Kini Usermin</a> atau dari sumber lain.
+index_updatedesc=Borang ini membolehkan anda menaik taraf modul Usermin yang didapati mengandungi pepijat atau lubang keselamatan dari halaman <a href=https://webmin.com/updates.html>Kemas Kini Usermin</a> atau dari sumber lain.
 index_thost=Nama hos
 index_tdesc=Penerangan
 index_tver=Versi

cluster-usermin/lang/nl

@@ -34,7 +34,7 @@ index_installon=Installeer op
 index_upgradeon=Servers om te upgraden
 index_update=Update Modules
 index_updateon=Servers om te updaten
-index_updatedesc=Met dit formulier kunt u Usermin modules upgraden via <a href=http://www.webmin.com/updates.html>Usermin Updates</a> of via een andere bron om bugs en veiligheid's problemen mee te herstellen.
+index_updatedesc=Met dit formulier kunt u Usermin modules upgraden via <a href=https://webmin.com/updates.html>Usermin Updates</a> of via een andere bron om bugs en veiligheid's problemen mee te herstellen.
 index_thost=Hostnaam
 index_tdesc=Omschrijving
 index_tver=Versie

cluster-usermin/lang/no

@@ -34,7 +34,7 @@ index_installon=Installer på
 index_upgradeon=Tjenere som skal oppgraderes
 index_update=Oppdater moduler
 index_updateon=Tjenere som skal oppdateres
-index_updatedesc=Her kan du oppgradere Webmin moduler som er funnet å inneholde feil eller sikkerhetshull fra siden <a href=http://www.webmin.com/updates.html>Usermin Oppdateringer</a> eller fra en annen kilde.
+index_updatedesc=Her kan du oppgradere Webmin moduler som er funnet å inneholde feil eller sikkerhetshull fra siden <a href=https://webmin.com/updates.html>Usermin Oppdateringer</a> eller fra en annen kilde.
 index_thost=Vertsnavn
 index_tdesc=Beskrivelse
 index_tver=Versjon

cluster-usermin/lang/pl

@@ -34,7 +34,7 @@ index_installon=Zainstaluj na
 index_upgradeon=Serwery do aktualizacji
 index_update=Aktualizuj moduły
 index_updateon=Serwery do aktualizacji
-index_updatedesc=Ten formularz pozwala na aktualizację modułów Usermin ze strony <a href=http://www.webmin.com/updates.html>Usermin Updates</a> lub z innego źródła.
+index_updatedesc=Ten formularz pozwala na aktualizację modułów Usermin ze strony <a href=https://webmin.com/updates.html>Usermin Updates</a> lub z innego źródła.
 index_thost=Nazwa hosta
 index_tdesc=Opis
 index_tver=Wersja

cluster-usermin/lang/pt.auto

@@ -34,7 +34,7 @@ index_installon=Instalar em
 index_upgradeon=Servidores para atualizar
 index_update=Módulos de atualização
 index_updateon=Servidores a serem atualizados
-index_updatedesc=Este formulário permite que você atualize os módulos Usermin que contêm bugs ou falhas de segurança na página <a href=http://www.webmin.com/updates.html>Atualizações do usuáriomin</a> ou de outra fonte.
+index_updatedesc=Este formulário permite que você atualize os módulos Usermin que contêm bugs ou falhas de segurança na página <a href=https://webmin.com/updates.html>Atualizações do usuáriomin</a> ou de outra fonte.
 index_thost=nome de anfitrião
 index_tdesc=Descrição
 index_tver=Versão

cluster-usermin/lang/pt_BR.auto

@@ -34,7 +34,7 @@ index_installon=Instalar em
 index_upgradeon=Servidores para atualizar
 index_update=Módulos de atualização
 index_updateon=Servidores a serem atualizados
-index_updatedesc=Este formulário permite que você atualize os módulos Usermin que contêm bugs ou falhas de segurança na página <a href=http://www.webmin.com/updates.html>Atualizações do usuáriomin</a> ou de outra fonte.
+index_updatedesc=Este formulário permite que você atualize os módulos Usermin que contêm bugs ou falhas de segurança na página <a href=https://webmin.com/updates.html>Atualizações do usuáriomin</a> ou de outra fonte.
 index_thost=nome de anfitrião
 index_tdesc=Descrição
 index_tver=Versão

cluster-usermin/lang/ru.auto

@@ -34,7 +34,7 @@ index_installon=Установить на
 index_upgradeon=Серверы для обновления
 index_update=Обновить модули
 index_updateon=Серверы для обновления
-index_updatedesc=Эта форма позволяет обновить модули Usermin, в которых обнаружены ошибки или дыры в безопасности со страницы <a href=http://www.webmin.com/updates.html>Usermin Updates</a> или из другого источника.
+index_updatedesc=Эта форма позволяет обновить модули Usermin, в которых обнаружены ошибки или дыры в безопасности со страницы <a href=https://webmin.com/updates.html>Usermin Updates</a> или из другого источника.
 index_thost=Hostname
 index_tdesc=Описание
 index_tver=Версия

cluster-usermin/lang/sk.auto

@@ -34,7 +34,7 @@ index_installon=Inštalovať na
 index_upgradeon=Servery na aktualizáciu
 index_update=Aktualizujte moduly
 index_updateon=Servery sa aktualizujú
-index_updatedesc=Tento formulár vám umožňuje inovovať moduly Usermin, o ktorých sa zistilo, že obsahujú chyby alebo bezpečnostné medzery, na stránke <a href=http://www.webmin.com/updates.html>Aktualizácie Usermin</a> alebo z iného zdroja.
+index_updatedesc=Tento formulár vám umožňuje inovovať moduly Usermin, o ktorých sa zistilo, že obsahujú chyby alebo bezpečnostné medzery, na stránke <a href=https://webmin.com/updates.html>Aktualizácie Usermin</a> alebo z iného zdroja.
 index_thost=Meno hosťa
 index_tdesc=popis
 index_tver=verzia

cluster-usermin/lang/sv.auto

@@ -34,7 +34,7 @@ index_installon=Installera på
 index_upgradeon=Servrar att uppgradera
 index_update=Uppdatera moduler
 index_updateon=Servrar att uppdatera
-index_updatedesc=Detta formulär låter dig uppgradera Usermin-moduler som har visat sig innehålla buggar eller säkerhetshål från sidan <a href=http://www.webmin.com/updates.html>Usermin Updates</a> eller från en annan källa.
+index_updatedesc=Detta formulär låter dig uppgradera Usermin-moduler som har visat sig innehålla buggar eller säkerhetshål från sidan <a href=https://webmin.com/updates.html>Usermin Updates</a> eller från en annan källa.
 index_thost=Värdnamn
 index_tdesc=Beskrivning
 index_tver=Version

cluster-usermin/lang/tr.auto

@@ -34,7 +34,7 @@ index_installon=Yükleme yeri
 index_upgradeon=Yükseltilecek sunucular
 index_update=Modülleri Güncelle
 index_updateon=Güncellenecek sunucular
-index_updatedesc=Bu form, <a href=http://www.webmin.com/updates.html>Usermin Güncellemeleri</a> sayfasından veya başka bir kaynaktan hata veya güvenlik deliği içerdiği tespit edilen Usermin modüllerini yükseltmenizi sağlar.
+index_updatedesc=Bu form, <a href=https://webmin.com/updates.html>Usermin Güncellemeleri</a> sayfasından veya başka bir kaynaktan hata veya güvenlik deliği içerdiği tespit edilen Usermin modüllerini yükseltmenizi sağlar.
 index_thost=Hostadı
 index_tdesc=Açıklama
 index_tver=versiyon

cluster-usermin/lang/uk.auto

@@ -34,7 +34,7 @@ index_installon=Встановити
 index_upgradeon=Сервери для оновлення
 index_update=Оновлення модулів
 index_updateon=Сервери для оновлення
-index_updatedesc=Ця форма дозволяє оновити модулі Usermin, які знайшли помилки або отвори в безпеці зі сторінки <a href=http://www.webmin.com/updates.html>Оновлення користувачів</a> або з іншого джерела.
+index_updatedesc=Ця форма дозволяє оновити модулі Usermin, які знайшли помилки або отвори в безпеці зі сторінки <a href=https://webmin.com/updates.html>Оновлення користувачів</a> або з іншого джерела.
 index_thost=Ім'я хоста
 index_tdesc=Опис
 index_tver=Версія

cluster-usermin/lang/zh.auto

@@ -34,7 +34,7 @@ index_installon=安装在
 index_upgradeon=服务器升级
 index_update=更新模块
 index_updateon=服务器要更新
-index_updatedesc=通过此表单，您可以从<a href=http://www.webmin.com/updates.html>Usermin Updates</a>页面或其他来源升级已发现包含错误或安全漏洞的Usermin模块。
+index_updatedesc=通过此表单，您可以从<a href=https://webmin.com/updates.html>Usermin Updates</a>页面或其他来源升级已发现包含错误或安全漏洞的Usermin模块。
 index_thost=主机名
 index_tdesc=描述
 index_tver=版

cluster-usermin/lang/zh_TW.auto

@@ -34,7 +34,7 @@ index_installon=安裝在
 index_upgradeon=服務器升級
 index_update=更新模塊
 index_updateon=服務器要更新
-index_updatedesc=通過此表單，您可以從<a href=http://www.webmin.com/updates.html>Usermin Updates</a>頁面或其他來源升級已發現包含錯誤或安全漏洞的Usermin模塊。
+index_updatedesc=通過此表單，您可以從<a href=https://webmin.com/updates.html>Usermin Updates</a>頁面或其他來源升級已發現包含錯誤或安全漏洞的Usermin模塊。
 index_thost=主機名
 index_tdesc=描述
 index_tver=版

cluster-webmin/lang/ar.auto

@@ -34,7 +34,7 @@ index_installon=التثبيت على
 index_upgradeon=خوادم للترقية
 index_update=وحدات التحديث
 index_updateon=خوادم لتحديث
-index_updatedesc=يسمح لك هذا النموذج بترقية وحدات Webmin التي تم اكتشاف أنها تحتوي على أخطاء أو ثغرات أمنية من صفحة <a href=http://www.webmin.com/updates.html>تحديثات Webmin</a> أو من مصدر آخر.
+index_updatedesc=يسمح لك هذا النموذج بترقية وحدات Webmin التي تم اكتشاف أنها تحتوي على أخطاء أو ثغرات أمنية من صفحة <a href=https://webmin.com/updates.html>تحديثات Webmin</a> أو من مصدر آخر.
 index_thost=اسم المضيف
 index_tdesc=وصف
 index_tver=الإصدار

cluster-webmin/lang/bg.auto

@@ -34,7 +34,7 @@ index_installon=Инсталиране на
 index_upgradeon=Сървъри за надграждане
 index_update=Актуализиране на модули
 index_updateon=Сървъри за актуализация
-index_updatedesc=Този формуляр ви позволява да надстроите Webmin модули, за които е открито, че съдържат грешки или дупки за сигурност от страницата <a href=http://www.webmin.com/updates.html>Webmin Updates</a> или от друг източник.
+index_updatedesc=Този формуляр ви позволява да надстроите Webmin модули, за които е открито, че съдържат грешки или дупки за сигурност от страницата <a href=https://webmin.com/updates.html>Webmin Updates</a> или от друг източник.
 index_thost=Име на хост
 index_tdesc=описание
 index_tver=версия

cluster-webmin/lang/ca

@@ -34,7 +34,7 @@ index_installon=Instal·la a
 index_upgradeon=Servidors per actualitzar
 index_update=Actualitza els Mòduls
 index_updateon=Servidors a actualitzar
-index_updatedesc=Aquest formulari permet actualitzar els mòduls Webmin que contenen errors o forats de seguretat des de la pàgina d'<a href=http://www.webmin.com/updates.html>Actualitzacions de Webmin</a> o des d'una altra font.
+index_updatedesc=Aquest formulari permet actualitzar els mòduls Webmin que contenen errors o forats de seguretat des de la pàgina d'<a href=https://webmin.com/updates.html>Actualitzacions de Webmin</a> o des d'una altra font.
 index_thost=Nom de host
 index_tdesc=Descripció
 index_tver=Versió

cluster-webmin/lang/cs

@@ -34,7 +34,7 @@ index_installon=Instalovat na
 index_upgradeon=Servery k povýšení
 index_update=Povýšení modulů
 index_updateon=Servery k povýšení
-index_updatedesc=Tento formulář umožní aktualizovat moduly Webminu, které obsahují chyby nebo bezpečnostní trhliny ze stránky <a href=http://www.webmin.com/updates.html>Aktualizace Webminu</a> nebo z jiného zdroje.
+index_updatedesc=Tento formulář umožní aktualizovat moduly Webminu, které obsahují chyby nebo bezpečnostní trhliny ze stránky <a href=https://webmin.com/updates.html>Aktualizace Webminu</a> nebo z jiného zdroje.
 index_thost=Jméno počítače
 index_tdesc=Poznámka
 index_tver=Verze

cluster-webmin/lang/da.auto

@@ -34,7 +34,7 @@ index_installon=Installer på
 index_upgradeon=Servere, der skal opgraderes
 index_update=Opdater moduler
 index_updateon=Servere, der skal opdateres
-index_updatedesc=Denne formular giver dig mulighed for at opgradere Webmin-moduler, der har vist sig at indeholde fejl eller sikkerhedshuller fra siden <a href=http://www.webmin.com/updates.html>Webmin Updates</a> eller fra en anden kilde.
+index_updatedesc=Denne formular giver dig mulighed for at opgradere Webmin-moduler, der har vist sig at indeholde fejl eller sikkerhedshuller fra siden <a href=https://webmin.com/updates.html>Webmin Updates</a> eller fra en anden kilde.
 index_thost=Værtsnavn
 index_tdesc=Beskrivelse
 index_tver=Version

cluster-webmin/lang/de

@@ -34,7 +34,7 @@ index_installon=Installieren auf
 index_upgradeon=Zu aktualisierende Server
 index_update=Module aktualisieren
 index_updateon=Zu aktualisierende Server
-index_updatedesc=Dieses Formular ermöglicht es Ihnen, Webmin-Module, die Fehler oder Sicherheitslücken enthalten, von der Seite <a href=http://www.webmin.com/updates.html>Webmin Updates</a> oder aus einer anderen Quelle zu aktualisieren.
+index_updatedesc=Dieses Formular ermöglicht es Ihnen, Webmin-Module, die Fehler oder Sicherheitslücken enthalten, von der Seite <a href=https://webmin.com/updates.html>Webmin Updates</a> oder aus einer anderen Quelle zu aktualisieren.
 index_thost=Hostname
 index_tdesc=Beschreibung
 index_tver=Version

cluster-webmin/lang/el.auto

@@ -34,7 +34,7 @@ index_installon=Εγκαταστήστε το
 index_upgradeon=Διακομιστές για αναβάθμιση
 index_update=Ενημερώστε τις ενότητες
 index_updateon=Οι διακομιστές για ενημέρωση
-index_updatedesc=Αυτή η φόρμα σάς επιτρέπει να αναβαθμίσετε μονάδες Webmin που έχουν βρεθεί ότι περιέχουν σφάλματα ή τρύπες ασφαλείας από τη σελίδα <a href=http://www.webmin.com/updates.html>Webmin Updates</a> ή από άλλη πηγή.
+index_updatedesc=Αυτή η φόρμα σάς επιτρέπει να αναβαθμίσετε μονάδες Webmin που έχουν βρεθεί ότι περιέχουν σφάλματα ή τρύπες ασφαλείας από τη σελίδα <a href=https://webmin.com/updates.html>Webmin Updates</a> ή από άλλη πηγή.
 index_thost=Όνομα κεντρικού υπολογιστή
 index_tdesc=Περιγραφή
 index_tver=Εκδοχή

cluster-webmin/lang/en

@@ -34,7 +34,7 @@ index_installon=Install on
 index_upgradeon=Servers to upgrade
 index_update=Update Modules
 index_updateon=Servers to update
-index_updatedesc=This form allows you to upgrade Webmin modules that have been found to contain bugs or security holes from the <a href=http://www.webmin.com/updates.html>Webmin Updates</a> page or from another source.
+index_updatedesc=This form allows you to upgrade Webmin modules that have been found to contain bugs or security holes from the <a href=https://webmin.com/updates.html>Webmin Updates</a> page or from another source.
 index_thost=Hostname
 index_tdesc=Description
 index_tver=Version

cluster-webmin/lang/es

@@ -34,7 +34,7 @@ index_installon=Instalar en
 index_upgradeon=Servidores en los que subir versión
 index_update=Actualizar Módulos
 index_updateon=Servidores a actualizar
-index_updatedesc=Este formulario le permite actualizar los módulos de Webmin que tienen errores o agujeros de seguridad desde la página <a href=http://www.webmin.com/updates.html>Webmin Updates</a> o desde otra fuente.
+index_updatedesc=Este formulario le permite actualizar los módulos de Webmin que tienen errores o agujeros de seguridad desde la página <a href=https://webmin.com/updates.html>Webmin Updates</a> o desde otra fuente.
 
 this_server=este servidor
 

cluster-webmin/lang/eu.auto

@@ -34,7 +34,7 @@ index_installon=Instalatu martxan
 index_upgradeon=Zerbitzariak bertsio berritzeko
 index_update=Eguneratzeko moduluak
 index_updateon=Zerbitzariak eguneratzeko
-index_updatedesc=Inprimaki honen bidez, <a href=http://www.webmin.com/updates.html>Webmin Eguneratzeak</a> orrialdetik akatsak edo segurtasun zuloak aurkitu dituzten Webmin moduluak berritzea da.
+index_updatedesc=Inprimaki honen bidez, <a href=https://webmin.com/updates.html>Webmin Eguneratzeak</a> orrialdetik akatsak edo segurtasun zuloak aurkitu dituzten Webmin moduluak berritzea da.
 index_thost=hostname
 index_tdesc=deskribapena
 index_tver=Bertsio

cluster-webmin/lang/fa.auto

@@ -34,7 +34,7 @@ index_installon=نصب کنید
 index_upgradeon=سرورهای به روزرسانی
 index_update=ماژول ها را به روز کنید
 index_updateon=سرورها برای بروزرسانی
-index_updatedesc=این فرم به شما امکان می دهد ماژول های وبمین را که پیدا شده است حاوی اشکالات یا حفره های امنیتی را از <a href=http://www.webmin.com/updates.html>به روزرسانی های وبمین</a> یا از منبع دیگری به روز کنید.
+index_updatedesc=این فرم به شما امکان می دهد ماژول های وبمین را که پیدا شده است حاوی اشکالات یا حفره های امنیتی را از <a href=https://webmin.com/updates.html>به روزرسانی های وبمین</a> یا از منبع دیگری به روز کنید.
 index_thost=نام میزبان
 index_tdesc=شرح
 index_tver=نسخه

cluster-webmin/lang/fi.auto

@@ -34,7 +34,7 @@ index_installon=Asenna päälle
 index_upgradeon=Päivitettävät palvelimet
 index_update=Päivitä moduulit
 index_updateon=Päivitettävät palvelimet
-index_updatedesc=Tämä lomake antaa sinun päivittää Webmin-moduuleja, joiden on havaittu sisältävän virheitä tai <a href=http://www.webmin.com/updates.html>Webmin-päivitykset</a> -sivulta tai muusta lähteestä.
+index_updatedesc=Tämä lomake antaa sinun päivittää Webmin-moduuleja, joiden on havaittu sisältävän virheitä tai <a href=https://webmin.com/updates.html>Webmin-päivitykset</a> -sivulta tai muusta lähteestä.
 index_thost=hostname
 index_tdesc=Kuvaus
 index_tver=Versio

cluster-webmin/lang/fr

@@ -34,7 +34,7 @@ index_installon=Installer sur
 index_upgradeon=Serveurs à mettre à niveau
 index_update=Mettre à jour les modules
 index_updateon=Serveurs à mettre à jour
-index_updatedesc=Ce formulaire vous permet de mettre à jour les modules Webmin qui sont censés contenir des bogues ou des trous de sécurité depuis la page <a href=http://www.webmin.com/updates.html>Webmin Updates</a> ou depuis une autre source.
+index_updatedesc=Ce formulaire vous permet de mettre à jour les modules Webmin qui sont censés contenir des bogues ou des trous de sécurité depuis la page <a href=https://webmin.com/updates.html>Webmin Updates</a> ou depuis une autre source.
 index_thost=Nom d'hôte
 index_tdesc=Description
 index_tver=Version

cluster-webmin/lang/hr

@@ -34,7 +34,7 @@ index_installon=Instaliraj na
 index_upgradeon=Poslužitelji za nadogradnju
 index_update=Obnovi Module
 index_updateon=Poslužitelji za nadopunu
-index_updatedesc=Ova forma dopušta Vam da Webmin module na kojima su pronađene greške ili propuste u sigurnosti nadograđujete iz stranice <a href=http://www.webmin.com/updates.html>Webmin Nadopune</a> ili iz nekog drugog izvora.
+index_updatedesc=Ova forma dopušta Vam da Webmin module na kojima su pronađene greške ili propuste u sigurnosti nadograđujete iz stranice <a href=https://webmin.com/updates.html>Webmin Nadopune</a> ili iz nekog drugog izvora.
 
 this_server=ovaj poslužitelj
 

cluster-webmin/lang/hu

@@ -34,7 +34,7 @@ index_installon=Install on
 index_upgradeon=Servers to upgrade
 index_update=Update Modules
 index_updateon=Servers to update
-index_updatedesc=This form allows you to upgrade Webmin modules that have been found to contain bugs or security holes from the <a href=http://www.webmin.com/updates.html>Webmin Updates</a> page or from another source.
+index_updatedesc=This form allows you to upgrade Webmin modules that have been found to contain bugs or security holes from the <a href=https://webmin.com/updates.html>Webmin Updates</a> page or from another source.
 index_thost=Hostname
 index_tdesc=Description
 index_tver=Version

cluster-webmin/lang/it.auto

@@ -34,7 +34,7 @@ index_installon=Installa su
 index_upgradeon=Server da aggiornare
 index_update=Moduli di aggiornamento
 index_updateon=Server da aggiornare
-index_updatedesc=Questo modulo consente di aggiornare i moduli Webmin che sono stati trovati contenere bug o falle di sicurezza dalla pagina <a href=http://www.webmin.com/updates.html>Aggiornamenti Webmin</a> o da un'altra fonte.
+index_updatedesc=Questo modulo consente di aggiornare i moduli Webmin che sono stati trovati contenere bug o falle di sicurezza dalla pagina <a href=https://webmin.com/updates.html>Aggiornamenti Webmin</a> o da un'altra fonte.
 index_thost=Nome host
 index_tdesc=Descrizione
 index_tver=Versione

cluster-webmin/lang/ja.auto

@@ -34,7 +34,7 @@ index_installon=にインストール
 index_upgradeon=アップグレードするサーバー
 index_update=更新モジュール
 index_updateon=更新するサーバー
-index_updatedesc=このフォームを使用すると、<a href=http://www.webmin.com/updates.html>Webmin Updates</a>ページまたは別のソースからバグやセキュリティホールが見つかったWebminモジュールをアップグレードできます。
+index_updatedesc=このフォームを使用すると、<a href=https://webmin.com/updates.html>Webmin Updates</a>ページまたは別のソースからバグやセキュリティホールが見つかったWebminモジュールをアップグレードできます。
 index_thost=ホスト名
 index_tdesc=説明
 index_tver=バージョン

cluster-webmin/lang/ko.auto

@@ -34,7 +34,7 @@ index_installon=에 설치
 index_upgradeon=업그레이드 할 서버
 index_update=업데이트 모듈
 index_updateon=업데이트 할 서버
-index_updatedesc=이 양식을 사용하면 <a href=http://www.webmin.com/updates.html>Webmin 업데이트</a> 페이지 또는 다른 소스에서 버그 나 보안 허점이있는 것으로 밝혀진 Webmin 모듈을 업그레이드 할 수 있습니다.
+index_updatedesc=이 양식을 사용하면 <a href=https://webmin.com/updates.html>Webmin 업데이트</a> 페이지 또는 다른 소스에서 버그 나 보안 허점이있는 것으로 밝혀진 Webmin 모듈을 업그레이드 할 수 있습니다.
 index_thost=호스트 이름
 index_tdesc=기술
 index_tver=버전

cluster-webmin/lang/ms.auto

@@ -34,7 +34,7 @@ index_installon=Pasang pada
 index_upgradeon=Pelayan untuk menaik taraf
 index_update=Kemas kini Modul
 index_updateon=Pelayan untuk mengemaskini
-index_updatedesc=Borang ini membolehkan anda menaik taraf modul Webmin yang didapati mengandungi pepijat atau lubang keselamatan dari halaman <a href=http://www.webmin.com/updates.html>Webmin Updates</a> atau dari sumber lain.
+index_updatedesc=Borang ini membolehkan anda menaik taraf modul Webmin yang didapati mengandungi pepijat atau lubang keselamatan dari halaman <a href=https://webmin.com/updates.html>Webmin Updates</a> atau dari sumber lain.
 index_thost=Nama hos
 index_tdesc=Penerangan
 index_tver=Versi