Fix to require trusted proxies for SSL client cert headers

This PR tightens handling of proxied SSL client certificate headers so they are only honored when Webmin is configured to trust SSL headers and the direct TCP peer matches an explicit `trusted_proxies` entry. The change preserves legacy forwarded-IP behavior for `trust_real_ip`, but prevents ambiguous legacy configs with no trusted proxy from accepting spoofable `X-SSL-Client-*` headers as authentication identity. During postinstall, such legacy configs now default to `no_trust_ssl=1`.
Merge branch 'master' of github.com:webmin/webmin
2026-08-21 14:30:41 +01:00 · 2026-06-30 14:23:01 +02:00 · 2026-06-29 20:18:06 -07:00 · 2026-06-29 20:17:23 -07:00 · 2026-06-30 01:47:25 +02:00 · 2026-06-29 23:28:48 +02:00
2100 changed files with 96932 additions and 12430 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# EditorConfig for Perl project
+# - Indentation: tabs
+# - Tab width: 8
+# - Indentation style: Ratliff
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
--- a/.github/workflows/close-inactive.yml
+++ b/.github/workflows/close-inactive.yml
@@ -0,0 +1,15 @@
+name: Close inactive
+
+on:
+  schedule:
+    - cron: "0 12 * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  close-inactive:
+    uses: webmin/webmin-ci-cd/.github/workflows/close-inactive.yml@main
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,19 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  prove:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Perl::Critic
+        run: sudo apt-get update && sudo apt-get install -y libperl-critic-perl
+      - name: prove -lr
+        run: prove -lr
--- a/.github/workflows/webmin.dev+webmin.yml
+++ b/.github/workflows/webmin.dev+webmin.yml
@@ -1,4 +1,4 @@
-name: "webmin.dev: webmin/webmin"
+name: Package and upload artifacts

 on:
  push:
@@ -6,21 +6,24 @@ on:
      - master
  release:
    types:
-      - published
+      - prereleased
+      - released

 jobs:
  build:
    uses: webmin/webmin-ci-cd/.github/workflows/master-workflow.yml@main
    with:
      build-type: package
-      project-name: webmin
+      project-name: ${{ github.event.repository.name }}
      is-release: ${{ github.event_name == 'release' }}
+      is-prerelease: ${{ github.event.release.prerelease || false }}
    secrets:
-      DEV_GPG_PH: ${{ secrets.DEV_GPG_PH }}
      DEV_IP_ADDR: ${{ secrets.DEV_IP_ADDR }}
      DEV_IP_KNOWN_HOSTS: ${{ secrets.DEV_IP_KNOWN_HOSTS }}
      DEV_UPLOAD_SSH_USER: ${{ secrets.DEV_UPLOAD_SSH_USER }}
      DEV_UPLOAD_SSH_DIR: ${{ secrets.DEV_UPLOAD_SSH_DIR }}
      PRERELEASE_UPLOAD_SSH_DIR: ${{ secrets.PRERELEASE_UPLOAD_SSH_DIR }}
      DEV_SSH_PRV_KEY: ${{ secrets.DEV_SSH_PRV_KEY }}
-      DEV_SIGN_BUILD_REPOS_CMD: ${{ secrets.DEV_SIGN_BUILD_REPOS_CMD }}
+      ALL_GPG_PH2: ${{ secrets.ALL_GPG_PH2 }}
+      CODE_REVIEW_API_KEY: ${{ secrets.CODE_REVIEW_API_KEY }}
+      CODE_REVIEW_SMTP_PASSWORD: ${{ secrets.CODE_REVIEW_SMTP_PASSWORD }}
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ tarballs/
 minimal/
 .DS_Store
 .vscode/settings.json
+debug.cgi
--- a/.perlcriticrc
+++ b/.perlcriticrc
@@ -0,0 +1,6 @@
+severity = 5
+
+# Octal file permission literals (0700, 0640, etc.) are the standard Perl
+# idiom for chmod/mkdir/permission helpers throughout this codebase. The
+# policy flags chmod 0700 itself, so it is too coarse for our use.
+[-ValuesAndExpressions::ProhibitLeadingZeros]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,257 @@
 ## Changelog

+#### 2.652 (July, 2026)
+* Fix to recognize hex numeric HTML entities to work in various elements
+
+#### 2.651 (June 28, 2026)
+* Fix Certbot-backed certificate requests and renewals to correctly parse PEM paths after issuance
+* Fix live activation of Linux bond interfaces [#2777](https://github.com/webmin/webmin/pull/2777)
+* Update the Authentic theme to the latest version with various improvements and fixes:
+  - Fix search-result all-items delete in File Manager
+  - Fix search-result delete ordering in File Manager
+  - Fix to speed up search-result deletion cleanup in File Manager
+
+#### 2.650 (June 25, 2026)
+* Add new Systemd Services and Units module
+* Add new GRUB 2 Boot Loader module
+* Add new Kea DHCP Server module
+* Add WebSocket proxy support to the Webmin Servers Index module
+* Add basic Alpine Linux support
+* Add IP-based Let's Encrypt certificate support with Certbot 5.3
+* Add editable SSH public keys for newly added Unix users in Users and Groups module
+* Add improvements to custom Webmin temporary directory handling
+* Add quick service and port forwarding controls to the nftables module
+* Add optional pre- and post-scripts for scheduled package updates
+* Add option to control when scheduled package update email is sent
+* Add per-user RPC/API-only access option to the Webmin Users module
+* Add Apache 2.4 MPM process limit directives [#1821](https://github.com/webmin/webmin/issues/1821)
+* Add dhcpcd network backend for Debian and Raspberry Pi OS [#1607](https://github.com/webmin/webmin/issues/1607)
+* Add hardware RAID passthrough devices config in the SMART Status module [#1704](https://github.com/webmin/webmin/issues/1704)
+* Update Xterm.js to fix Control-C handling on iPadOS/Safari terminals
+* Update Webmin systemd service unit to run without forking
+* Fix IPv6 CIDR access control matching [#1570](https://github.com/webmin/webmin/issues/1570)
+* Fix Bootup and Shutdown module to show only services and not all units on systemd systems
+* Fix Let's Encrypt renewal scheduling to count from the last successful request
+* Fix NetworkManager detection on Debian and IPv6 DNS nameserver saving
+* Fix Dovecot configuration file handling when saving extra configs
+* Fix mailbox listing to skip unusable Maildir entries and remove stale deleted or moved entries
+* Fix Postfix module labels to identify virtual alias maps instead of virtual mailbox domains #1541
+* Fix Apache module to hide disabled default virtual hosts from the active server list
+* Fix Netplan DNS saving to preserve YAML structure
+* Fix BIND DNS handling of underscores, trailing dots, and mass record length checks
+* Fix MariaDB user creation when using auth plugin syntax
+* Fix PHP-FPM monitor on EL systems when using `/etc/php.ini` as the config file
+* Fix RPC-only accounts to block browser/module access before module ACL checks
+* Fix reflected XSS in Webmin status messages
+* Fix path validation in File Manager, package delete helpers, and Apache virtual host files
+* Fix authentication state handling for SSL certificate logins and proxied keep-alive requests
+* Update session handling to improve security, which will require users to re-authenticate after upgrading
+* Update the Authentic theme to the latest version with various improvements and fixes:
+  - Add zooming to stats history graphs by holding shift and scrolling in the dashboard
+  - Add support for saving live stats history for up to 24 hours without performance impact
+  - Add better support for the new Nginx, nftables, and upcoming systemd, Kea-DHCP, and GRUB 2 Webmin modules
+  - Add ability to always show available dashboard panels in theme configuration
+  - Add support for live stats and terminal WebSocket connections through Webmin Servers Index proxy links
+  - Fix proxying when Webmin is accessed with a webprefix using Webmin Servers Index module
+  - Fix theme UI helpers to escape generated markup more safely
+  - Fix iOS terminal viewport sizing
+  - Fix editor save handling, clean-state indication and dirty reload guard
+  - Fix popover positioning, z-index and border color for help bubbles
+  - Fix the active product switch border in the navigation menu for the dark palette
+  - Fix to validate password reset return URLs
+
+#### 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:
+  - Add a new airy button style to the light palette to match the dark one  
+  - Fix to optimize stats server to reduce WebSocket memory usage  
+  - Fix the real-time follow indicator when viewing the journal  
+  - Fix regex-based match highlighting when viewing the journal  
+  - Fix mail compose panel sizing in HTML mode on low-DPR screens  
+  - Fix display of the 2FA QR code in the dark palette
+
+#### 2.621 (January 25, 2026)
+* Fix to prevent NAT from dropping idle RPC sessions during long transfers
+* Fix to improve the message when socket authentication is used in the MySQL/MariaDB module
+* Fix to make upload tracking work correctly in all situations and on all systems
+* Fix to correctly display the PHP version in the PHP Configuration module when managing packages
+* Update Xterm.js to the latest version with lots of improvements and fixes
+* Update Authentic theme to the latest version with various improvements and fixes:
+  * Fix the support for the cloned Terminal module
+  * Fix error handling for file uploads when the user is out of quota or the system is out of disk space in the File Manager module
+  * Fix to stop loading full file into memory for upload check to prevent memory leak on large uploads in the File Manager module
+  * Fix to permanently save the state of the navigation menu and right-side slider when toggled
+
+
+#### 2.620 (January 9, 2026)
+* Add ability to use correct driver depending on the database in MySQL/MariaDB module
+* Add improvements to BIND DNS module for better key management
+* Add support for Ubuntu 26.04 development preview
+* Add a config option to increase the RPC timeout
+* Add support for EC SSL certificate and key in the ProFTPd module
+* Add support for using `gpart` in FreeBSD disk management module
+* Add support for Ed25519 public key in User and Groups module
+* Fix RPC session timeout during large file transfers
+* Fix selection and configuration of TLS certificate and key in the ProFTPd module
+* Update Authentic theme to the latest version with various improvements and fixes:
+  * Add support for multiple scrollable tabs in the File Manager
+  * Fix displaying of the right-side toolbar in File Manager when using Safari
+  * Fix to print menu separator when no virtual servers are added yet in Virtualmin
+  * Fix bugs in white palette
+  * Fix exported file name in data tables
+
+#### 2.610 (November 23, 2025)
+* Fix to drop dependency on `IO::Pty` Perl module
+* Fix `virtual-server` module server-side search to work correctly
+* Update the Authentic theme to the latest version with various improvements and fixes:
+  - Add a range slider to adjust content page margins more precisely
+  - Add an option to enable rounded corners for content page
+  - Add more customization options for pie charts
+  - Fix to increase clickable area for checkboxes in File Manager
+  - Fix to correct rotation of pin and unpin button for right side slider
+  - Fix color of selected items in the multiselect dropdown
+  - Fix to improve the visibility of disabled checkboxes
+  - Fix to send saved params in the post body when saving theme configuration
+    [More details...](https://github.com/webmin/authentic-theme/releases/tag/26.20)
+
+#### 2.600 (November 9, 2025)
+* Add an options to enable the slow query log in the MySQL/MariaDB module [#2560](https://github.com/webmin/webmin/issues/2560)
+* Add ability to install multiple PHP extensions at once in the PHP Configuration module
+* Add ability to show package URL in the Software Packages module [#1141](https://github.com/virtualmin/virtualmin-gpl/issues/1141)
+* Add support to show Debian package install time in the Software Packages module
+* Add support to show detailed Webmin server stats using new `webmin stats` CLI command [forum.virtualmin.com/t/135556](https://forum.virtualmin.com/t/is-this-memory-used-a-bit-high/135556/6?u=ilia)
+* Add a major Authentic theme UI update with lots of visual and structural improvements for a smoother and more modern experience
+[More details...](https://forum.virtualmin.com/t/authentic-theme-version-26-00-release-overview/135755?u=ilia)
+* Fix EOL library fatal error for OS in development [#2121](https://github.com/webmin/webmin/issues/2121)
+* Fix correctly saving jails with parameters containing quotes in the Fail2Ban module [#2572](https://github.com/webmin/webmin/issues/2572)
+* Fix file is always renamed as the effective user in the Upload and Download module [#1054](https://github.com/webmin/webmin/issues/1054)
+
+#### 2.520 (October 4, 2025)
+* Fix to make sure the mail URL uses a well-known host name [security]
+* Fix support for other Raspberry Pi sensors [#2545](https://github.com/webmin/webmin/issues/2545)
+* Fix the printing of the bottom button row in the form column table
+* Fix to recommend Perl `Sys::Syslog` module [#2557](https://github.com/webmin/webmin/issues/2557)
+* Fix to avoid using short hostname in HTTPS redirects when an FQDN is available
+* Fix to use _/proc_ sampler instead of `vmstat` for the same output with much lower overhead
+* Fix to query specific fields in FreeBSD memory stats collection, cutting CPU use by 80%
+* Fix to kill Webmin subprocesses during RC stop on FreeBSD and other systems
+* Fix to correctly fetch command version in `PPTP VPN Client` module [#2567](https://github.com/webmin/webmin/issues/2567)
+* Add a complete overhaul of `var_dump` subroutine, which is now fully portable
+* Update the Authentic theme to the latest version with various fixes:
+  - Fix the text color when reading email in the Read User Mail module [webmin#2555](https://github.com/webmin/webmin/issues/2555)
+  - Fix to ensure the selected color palette is correctly stored when changed manually [webmin#2552](https://github.com/webmin/webmin/issues/2552)
+  - Fix a bug when the Webmin version label was missing when copying to clipboard system information from the dashboard
+  - Fix DNS query spike from network stats collection on FreeBSD [webmin#2556](https://github.com/webmin/webmin/issues/2556)
+  - Fix to display the appropriate icon for proxy mode on new Bunny DNS
+  - Fix spinner color in toast messages for dark palette
+  - Fix other bugs and add various small improvements
+
+#### 2.510 (September 16, 2025)
+* Fix to ensure DNSSEC re-signing period is less than 30 days in the BIND DNS module
+* Fix to treat 201 as a valid response code in the internal download function
+* Update the Authentic theme to the latest version with various improvements and fixes:
+  - Add optimizations to dashboard graphs with dynamic trimming to prevent page lagging
+  - Add improvements to how the system cache for the dashboard is updated
+  - Add support to correctly reload the page in proxy mode
+  - Add an option to choose if default page should always load when switching navigation
+  - Fix to ensure the color palette is preserved for the user [webmin#2537](https://github.com/webmin/webmin/issues/2537)
+  - Fix algorithm for calculating rows per page in data table pagination
+  - Fix the alert info box text color for dark mode
+  - Fix critical lags and appearance of Custom Commands module 
+
+#### 2.501 (September 10, 2025)
+* Add support for Raspberry Pi sensors #2539 #2517
+* Add Squid 7 support
+* Update the Authentic theme to the latest version with the following fixes:
+  - Fix broken editor in "Bootup and Shutdown" module
+
+#### 2.500 (September 4, 2025)
+* Add support for the Webmin webserver to work in both HTTP and HTTPS modes at the same time
+* Add distinct warning to the login page if the connection is not secure
+* Add support for timeouts in temporary rules in "FirewallD" module
+* Add support for the new Dovecot version 2.4
+* Add support for MariaDB version 12 #2522
+* Add support for IMAP through a local command for Usermin
+* Add latest SSLeay support for redirects to SSL work
+* Add improvements to "Bootup and Shutdown" module for _systemd_ systems
+* Add field for secondary server key in "BIND DNS Server" module
+* Add reversible encryption helpers API
+* Add API to display relative dates
+* Add API to mask sensitive text, like displayed passwords, unless hovered over
+* Add status monitor for PHP FPM #2499
+* Add support for DNF5 format in the "Software Packages" module
+* Add support for redirecting to the enforced domain when the `musthost_redirect` directive is set
+* Add option to customize the SMTP login for scheduled background monitoring in the "System and Server Status" module
+* Change to show relative dates in "Webmin Users: Current Login Sessions" and "Webmin Actions Log: Search Results" pages
+* Change "Last Logins" on the dashboard to show usernames, relative dates, and all users from the past 3 days
+* Change to always enable HSTS by default
+* Fix MySQL/MariaDB to remove obsolete `set-variable` options that break modern config files #2497
+* Fix download link in table rows in "MySQL/MariaDB Database Server" module
+* Fix module not to fail on old MySQL 5.5
+* Update the Authentic theme to the latest version with various improvements and fixes:
+  - Add support to automatically set the color palette based on OS or browser preferences
+  - Add improvements to tooltips in dark palette
+  - Change the default shortcut key for toggling the light/dark palette
+  - Change the default shortcut key for toggling right slider
+  - Change wording to use "shortcut" instead of "hotkey"
+  - Change the default maximum column width
+  - Fix navigation menu load in proxy mode #2502
+  - Fix navigation menu to always stay in sync with the product switch
+  - Fix sporadic issue where the navigation menu disappeared and the content page was shifted
+  - Fix info alert text color and button color in the dark palette
+  - Fix styling of checkboxes and radios for backup and restore pages in Virtualmin
+  - Fix styling for extra backup destinations in Virtualmin
+  - Fix advanced schedule display in the cron chooser in Virtualmin
+    [More details...](https://github.com/webmin/authentic-theme/releases/tag/25.00)
+
+#### 2.402 (June 16, 2025)
+* Update the Authentic theme to the latest version with various fixes and improvements
+* Fix support for EL10-based systems
+
+#### 2.401 (June 2, 2025)
+* Add forgotten password recovery support for Virtualmin mailbox users
+* Add forgotten password recovery support in Usermin
+* Fix account lock status check in MySQL/MariaDB module that was blocking new database user creation #2484
+* Fix to prevent safe users from sending emails
+* Fix to always show password recovery link if enabled
+
 #### 2.400 (May 25, 2025)
 * Add built-in support for forgotten password recovery
 * Add support for SSL certificates and DNS over TLS in the BIND module
@@ -112,7 +364,7 @@
 * Update the Authentic theme to the latest version with various fixes and improvements

 #### 2.201 (July 24, 2024)
-* Fix real-time monitoring not updating graphs in the Dashboard [#2222](https://github.com/webmin/webmin/issues/2222)
+* Fix real-time monitoring not updating graphs in the dashboard [#2222](https://github.com/webmin/webmin/issues/2222)
 * Fix Terminal module to work correctly with _sudo_-capable users [#2223](https://github.com/webmin/webmin/issues/2223)

 #### 2.200 (July 21, 2024)
@@ -155,7 +407,7 @@
 * Fix to using the `qrencode` command to generate QR codes locally instead of the remote Google Chart API
 * Fix a number of various other issues

-#### 2.105 (November 09, 2023)
+#### 2.105 (November 9, 2023)
 * Fix param to read only headers [sourceforge.net/usermin-bugs#501](https://sourceforge.net/p/webadmin/usermin-bugs/501/)
 * Fix not to set `reuse` flag on initial Let's Encrypt request
 * Fix to correctly escape mail file names upon deletion
@@ -170,7 +422,7 @@
 * Fix the absent init script for legacy systems after the initial installation
 * Update the Authentic theme to the latest version with various fixes and improvements

-#### 2.103 (October 08, 2023)
+#### 2.103 (October 8, 2023)
 * Add support for hostname detection using `hostnamectl` command
 * Add support for other ACME services
 * Add ability to hide dotfiles in File Manager [#1578](https://github.com/webmin/authentic-theme/issues/1578)
@@ -219,13 +471,13 @@
 * Fix clearing packages caches before checking for updates in status collection #1863
 * Update the Authentic theme to the latest version

-#### 2.020 (March 08, 2023)
+#### 2.020 (March 8, 2023)
 * Add full locale support
 * Add slave zone file format option in BIND DNS module
 * Add support for editing ACLs in File Manager
 * Add support to configure SSL connection for MySQL/MariaDB module
 * Add support for compressed backups in PostgreSQL module
-* Add support for displaying inodes too in Disk Usage in the Dashboard
+* Add support for displaying inodes too in Disk Usage in the dashboard
 * Add better support for CloudLinux
 * Fix to always default to RSA key type in Let's Encrypt requests
 * Fix setup repository script for Oracle
@@ -233,7 +485,7 @@
 * Fix support for SpamAssassin 4
 * Fix to use system default hashing format for `htpasswd` file
 * Fix FastRPC issues
-* Update the Authentic theme to the latest version, with sped-up Dashboard performance
+* Update the Authentic theme to the latest version, with sped-up dashboard performance

 #### 2.013 (January 19, 2023)
 * Fix Authentic theme issue with error handling
@@ -387,12 +639,12 @@ 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 04, 2019)
+#### 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.

-#### Version 1.910 (May 09, 2019)
+#### Version 1.910 (May 9, 2019)
 This release includes theme and translation updates, a page for editing package repositories, cron and status module improvements, and a bunch of other bugfixes and small improvements.

 #### Version 1.900 (November 19, 2018)
@@ -404,7 +656,7 @@ This version includes Ubuntu 18 network config support, translation updates, mul
 #### Version 1.880 (March 16, 2018)
 This version includes German, Catalan and Bulgarian translation updates, a new version of the Authentic theme, support for directly editing the MySQL and PostgreSQL config files, Let's Encrypt bugfixes, more control over system status email notifications, and more.

-#### Version 1.870 (December 08, 2018)
+#### Version 1.870 (December 8, 2018)
 This release includes many translation updates, fixes for Let's Encrypt support, UI cleanups, and most importantly a new major version of the Authentic theme.

 #### Version 1.860 (October 10, 2017)
@@ -413,7 +665,7 @@ This release includes Let's Encrypt DNS fixes, Majordomo module improvements, XS
 #### Version 1.850 (June 28, 2017)
 This release includes Let's Encrypt fixes, Majordomo module improvements, FirewallD forwarding support, translation updates, an update to the Authentic theme, and a bunch of other bugfixes.

-#### Version 1.840 (May 08, 2017)
+#### Version 1.840 (May 8, 2017)
 This major release includes a large theme update, XSS security fixes, per-domain SSL cert support, thin-provisioned LVM support, Let's Encrypt improvements, translation updates, and the usual gang of bugfixes. Also available is Usermin 1.710, which contains many of the same updates.

 #### Version 1.830 (December 29, 2016)
@@ -720,4 +972,3 @@ This updated includes the latest Authentic theme, a new IPv6 Firewall module for
 #### Version 1.140
 * Fixed a security hole that allowed any user to view the configuration of any module, even those that they should not have access to.
 * Fixed a security hole that could allow an attacker to lock valid users by sending a bogus username or password.
-
--- a/README-zh.md
+++ b/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) 脚本，无需任何选项，也就是说会直接安装到当前目录。或者使用命令行参数，例如目标目录。
-  <kbd>注：如果你正在安装 Webmin [到Windows](http://www.webmin.com/windows.html) 系统上，你必须运行 `perl setup.pl` 命令。Windows 版能否正常运行取决于许多程序，和可能不属于标准发行版的模块。你需要 _process.exe_ 命令， _sc.exe_ 命令，以及 _Win32::Daemon_ Perl 模块。</kbd>
+ 2. 下载并解压[源码](https://prdownloads.sourceforge.net/webadmin/webmin-1.996.tar.gz)然后运行[_setup.sh_](https://webmin.com/tgz.html) 脚本，无需任何选项，也就是说会直接安装到当前目录。或者使用命令行参数，例如目标目录。
+  <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,12 +39,12 @@ 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)

 ### 贡献者

 * [Joe Cooper](https://github.com/swelljoe)
-* [Ilia Rostovtsev](https://github.com/iliajie)
+* [Ilia Rostovtsev](https://github.com/iliaross)
 * [Kay Marquardt](https://github.com/gnadelwartz)
 * [Nawawi Jamili](https://github.com/nawawi) + [其他无偿奉献的开发者](https://github.com/webmin/webmin/graphs/contributors)

--- a/README.md
+++ b/README.md
@@ -19,11 +19,11 @@
 **Webmin** is a web-based system administration tool for Unix-like servers, and services with about _1,000,000_ yearly installations worldwide. Using it, it is possible to configure operating system internals, such as users, disk quotas, services or configuration files, as well as modify, and control open-source apps, such as BIND DNS Server, Apache HTTP Server, PHP, MySQL, and many more.

 <p align="center">
-  <a href="https://webmin.com/screenshots/#gh-light-mode-only" target="_blank">
-    <img width="1440" alt="Dashboard screenshot" src="https://user-images.githubusercontent.com/4426533/218264253-c08fb45a-8d75-44bf-93b3-37a2ecae3d20.png">
+  <a href="https://webmin.com/screenshots/?theme=light#gh-light-mode-only" target="_blank">
+    <img width="1440" alt="Dashboard screenshot" src="https://github.com/user-attachments/assets/a01d0a78-4130-4665-9284-814955ae1c97">
  </a>
-  <a href="https://webmin.com/screenshots/#gh-dark-mode-only" target="_blank">
-    <img width="1440" alt="Dashboard screenshot" src="https://user-images.githubusercontent.com/4426533/218265232-31140aa6-ada1-4019-bd75-04240aeabc83.png">
+  <a href="https://webmin.com/screenshots/?theme=dark#gh-dark-mode-only" target="_blank">
+    <img width="1440" alt="Dashboard screenshot" src="https://github.com/user-attachments/assets/da4b90a0-c002-4e10-8b34-5acb251bbec9">
  </a>
 </p>

@@ -45,16 +45,16 @@ 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/iliajie)
+* [Ilia Rostovtsev](https://github.com/iliaross)
 * [Joe Cooper](https://github.com/swelljoe)

 ### Contributors
 * [Kay Marquardt](https://github.com/gnadelwartz)
 * [Nawawi Jamili](https://github.com/nawawi)
-* [unknown10777](https://github.com/unknown10777) + [90 more..](https://github.com/webmin/webmin/graphs/contributors)
+* [unknown10777](https://github.com/unknown10777) + [90 more...](https://github.com/webmin/webmin/graphs/contributors)

 ## License

--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,23 +1,242 @@
-## Reporting Security Issues

-Please send all reports of security issues found in Webmin to security@webmin.com
-via email, ideally PGP encrypted with the key from https://www.webmin.com/jcameron-key.asc .
+> [!WARNING]
+> **Found a bug?** If you’ve found a new security-related issue, email
+> [security@webmin.com](mailto:security@webmin.com).

-Potential security issues, in descending order of impact, include :
+### Webmin 2.510 and below [October 9, 2025]
+#### Host header injection vulnerability in the password reset feature [CVE-2025-61541]

-* Remotely exploitable attacks that allow `root` access to Webmin without
-  any credentials.
+- If the password reset feature is enabled, an attacker can use a specially
+  crafted host header to cause the password reset email to contain a link to a
+  malicious site.

-* Privilege escalation vulnerabilities that allow non-`root` users of Webmin
-  to run commands or access files as `root`.
+  > Thanks to Nyein Chan Aung and Mg Demon for reporting this.

-* XSS attacks that target users already logged into Webmin when they visit
-  another website.
+### Webmin 2.202 and below [February 26, 2025]
+#### SSL certificates from clients may be trusted unexpectedly

-Things that are not actually security issues include :
+- If Webmin is configured to trust remote IP addresses provided by a proxy *and*
+  you have users authenticating using client SSL certificates, a browser
+  connecting directly (not via the proxy) can provide a forged header to fake
+  the client certificate.

-* XSS attacks that are blocked by Webmin's referrer checks, which are enabled
-  by default.
+- Upgrade to Webmin 2.301 or later, and if there is any chance of direct
+  requests by clients disable this at **Webmin ⇾ Webmin Configuration ⇾ IP
+  Access Control** page using **Trust level for proxy headers** option.

-* Attacks that require modifications to Webmin's code or configuration, which
-  can only be done by someone who already has `root` permissions.
+  > Thanks to Keigo YAMAZAKI from LAC Co., Ltd. for reporting this.
+
+### Webmin 2.105 and below [April 15, 2024]
+#### Privilege escalation by non-root users [CVE-2024-12828]
+
+- A less-privileged Webmin user can execute commands as root via a vulnerability in the shell autocomplete feature.
+
+- All Virtualmin admins and Webmin admins who have created additional accounts should upgrade to version 2.111 as soon as possible!
+
+  > Thanks to Trend Micro’s Zero Day Initiative for finding and reporting this issue.
+
+### Webmin 1.995 and Usermin 1.850 and below [June 30, 2022]
+#### XSS vulnerability in the HTTP Tunnel module
+
+- If a less-privileged Webmin user is given permission to edit the configuration of the HTTP Tunnel module, he/she could use this to introduce a vulnerability that captures cookies belonging to other Webmin users that use the module.
+
+  > Thanks to [BLACK MENACE][2] and [PYBRO][3] for reporting this issue.
+
+- An HTML email crafted by an attacker could capture browser cookies when opened.
+
+  > Thanks to [ly1g3][4] for reporting this bug.
+
+### Webmin 1.991 and below [April 18, 2022]
+#### Privilege escalation exploit [CVE-2022-30708]
+- Less privileged Webmin users (excluding those created by Virtualmin and Cloudmin) can modify arbitrary files with root privileges, and so run commands as root. All systems with additional untrusted Webmin users should upgrade immediately.
+
+  > Thanks to [esp0xdeadbeef][5] and [V1s3r1on][6] for finding and reporting this issue!
+
+### Webmin 1.984 and below [December 26, 2021]
+#### File Manager privilege exploit [CVE-2022-0824 and CVE-2022-0829]
+
+- Less privileged Webmin users who do not have any File Manager module restrictions configured can access files with root privileges, if using the default Authentic theme. All systems with additional untrusted Webmin users should upgrade immediately. Note that Virtualmin systems are not effected by this bug, due to the way domain owner Webmin users are configured.
+
+  > Thanks to Faisal Fs ([faisalfs10x][7]) from [NetbyteSEC][8] for finding and reporting this issue!
+
+### Virtualmin Procmail wrapper version 1.0
+#### Privilege escalation exploit
+- Version 1.0 of the `procmail-wrapper` package installed with Virtualmin has a vulnerability that can be used by anyone with SSH access to gain `root` privileges. To prevent this, all Virtualmin users should upgrade to version 1.1 or later immediately.
+
+### Webmin 1.973 and below [March 7, 2021]
+#### XSS vulnerabilities if Webmin is installed using the `setup.pl` script [CVE-2021-31760, CVE-2021-31761 and CVE-2021-31762]
+
+- If Webmin is installed using the non-recommended `setup.pl` script, checking for unknown referers is not enabled by default. This opens the system up to XSS and CSRF attacks using malicious links. Fortunately the standard `rpm`, `deb`, `pkg` and `tar` packages do not use this script and so are not vulnerable. If you did install using the `setup.pl` script, the vulnerability can be fixed by adding the line `referers_none=1` to `/etc/webmin/config` file.
+
+ > Thanks to Meshal ( Mesh3l\_911 ) [@Mesh3l\_911][9] and Mohammed ( Z0ldyck ) [@electronicbots][10] for finding and reporting this issue!
+
+### Webmin 1.941 and below [January 16, 2020]
+#### XSS vulnerability in the Command Shell module [CVE-2020-8820 and CVE-2020-8821]
+
+- A user with privileges to create custom commands could exploit other users via unescaped HTML.
+
+ > Thanks to Mauro Caseres for reporting this and the following issue.
+
+### Webmin 1.941 and below [January 16, 2020]
+#### XSS vulnerability in the Read Mail module [CVE-2020-12670]
+- Saving a malicious HTML attachment could trigger and XSS vulnerability.
+
+### Webmin 1.882 to 1.921 [July 6, 2019]
+#### Remote Command Execution [CVE-2019-15231]
+- Webmin releases between these versions contain a vulnerability that allows remote command execution! Version 1.890 is vulnerable in a default install and should be upgraded immediately - other versions are only vulnerable if changing of expired passwords is enabled, which is not the case by default.
+
+  Either way, upgrading to version 1.930 is strongly recommended. Alternately, if running versions 1.900 to 1.920, edit `/etc/webmin/miniserv.conf`, remove the `passwd_mode=` line, then run `/etc/webmin/restart` command.
+{{< details-start post-indent-details "More details.."  >}}
+    Webmin version 1.890 was released with a backdoor that could allow anyone with knowledge of it to execute commands as root. Versions 1.900 to 1.920 also contained a backdoor using similar code, but it was not exploitable in a default Webmin install. Only if the admin had enabled the feature at **Webmin ⇾ Webmin Configuration ⇾ Authentication** to allow changing of expired passwords could it be used by an attacker.
+
+    Neither of these were accidental bugs - rather, the Webmin source code had been maliciously modified to add a non-obvious vulnerability. It appears that this happened as follows :
+
+    - At some time in April 2018, the Webmin development build server was exploited and a vulnerability added to the `password_change.cgi` script. Because the timestamp on the file was set back, it did not show up in any Git diffs. This was included in the Webmin 1.890 release.
+    - The vulnerable file was reverted to the checked-in version from GitHub, but sometime in July 2018 the file was modified again by the attacker. However, this time the exploit was added to code that is only executed if changing of expired passwords is enabled. This was included in the Webmin 1.900 release.
+    - On September 10th 2018, the vulnerable build server was decommissioned and replaced with a newly installed server running CentOS 7. However, the build directory containing the modified file was copied across from backups made on the original server.
+    - On August 17th 2019, we were informed that a 0-day exploit that made use of the vulnerability had been released. In response, the exploit code was removed and Webmin version 1.930 created and released to all users.
+
+    In order to prevent similar attacks in future, we're doing the following :
+
+    - Updating the build process to use only checked-in code from GitHub, rather than a local directory that is kept in sync.
+    - Rotated all passwords and keys accessible from the old build system.
+    - Auditing all GitHub commits over the past year to look for commits that may have introduced similar vulnerabilities.
+{{< details-end >}}
+
+### Webmin 1.900 [November 19, 2018]
+#### Remote Command Execution (Metasploit)
+
+- This is _not_ a workable exploit as it requires that the attacker already know the root password. Hence there is no fix for it in Webmin.
+
+### Webmin 1.900 and below [November 19, 2018]
+#### Malicious HTTP headers in downloaded URLs
+
+ - If the Upload and Download or File Manager module is used to fetch an un-trusted URL. If a Webmin user downloads a file from a malicious URL, HTTP headers returned can be used exploit an XSS vulnerability.
+
+ > Thanks to independent security researcher, John Page aka hyp3rlinx, who reported this vulnerability to Beyond Security's SecuriTeam Secure Disclosure program.
+
+### Webmin 1.800 and below [May 26, 2016]
+#### Authentic theme configuration page vulnerability
+ - Only an issue if your system has un-trusted users with Webmin access and is using the new Authentic theme. A non-root Webmin user could use the theme configuration page to execute commands as root.
+
+#### Authentic theme remote access vulnerability
+ - Only if the Authentic theme is enabled globally. An attacker could execute commands remotely as root, as long as there was no firewall blocking access to Webmin's port 10000.
+
+### Webmin 1.750 and below [May 12, 2015]
+#### XSS (cross-site scripting) vulnerability in `xmlrpc.cgi` script [CVE-2015-1990]
+ - A malicious website could create links or JavaScript referencing the `xmlrpc.cgi` script, triggered when a user logged into Webmin visits the attacking site.
+
+ > Thanks to Peter Allor from IBM for finding and reporting this issue.
+
+### Webmin 1.720 and below [November 24, 2014]
+#### Read Mail module vulnerable to malicious links
+ - If un-trusted users have both SSH access and the ability to use Read User Mail module (as is the case for Virtualmin domain owners), a malicious link could be created to allow reading any file on the system, even those owned by _root_.
+
+ > Thanks to Patrick William from RACK911 labs for finding this bug.
+
+### Webmin 1.700 and below [August 11, 2014]
+#### Shellshock vulnerability
+ - If your _bash_ shell is vulnerable to _shellshock_, it can be exploited by attackers who have a Webmin login to run arbitrary commands as _root_. Updating to version 1.710 (or updating _bash_) will fix this issue.
+
+### Webmin 1.590 and below [June 30, 2012]
+#### XSS (cross-site scripting) security hole
+ - A malicious website could create links or JavaScript referencing the File Manager module that allowed execution of arbitrary commands via Webmin when the website is viewed by the victim. See [CERT vulnerability note VU#788478][12] for more details. Thanks to Jared Allar from the American Information Security Group for reporting this problem.
+
+#### Referer checks don't include port
+- If an attacker has control over `http://example.com/` then he/she could create a page with malicious JavaScript that could take over a Webmin session at `https://example.com:10000/` when `http://example.com/` is viewed by the victim.
+
+ > Thanks to Marcin Teodorczyk for finding this issue.
+
+### Webmin 1.540 and below [April 20, 2011]
+#### XSS (cross-site scripting) security hole
+ - This vulnerability can be triggered if an attacker changes his Unix username via a tool like `chfn`, and a page listing usernames is then viewed by the root user in Webmin.
+
+ > Thanks to Javier Bassi for reporting this bug.
+
+### Virtualmin 3.70 and below [June 23, 2009]
+#### Unsafe file writes in Virtualmin
+ - This bug allows a virtual server owner to read or write to arbitrary files on the system by creating malicious symbolic links and then having Virtualmin perform operations on those links. Upgrading to version 3.70 is strongly recommended if your system has un-trusted domain owners.
+
+### Webmin 1.390 and below, Usermin 1.320 and below [February 8, 2008]
+#### XSS (cross-site scripting) security hole
+ - This attack could open users who visit un-trusted websites while having Webmin open in the same browser up to having their session cookie captured, which could then allow an attacker to login to Webmin without a password. The quick fix is to go to the **Webmin Configuration** module, click on the **Trusted Referers** icon, set **Referrer checking enabled?** to **Yes**, and un-check the box **Trust links from unknown referrers**. Webmin 1.400 and Usermin 1.330 will make these settings the defaults.
+
+### Webmin 1.380 and below [November 3, 2007]
+#### Windows-only command execution bug
+ - Any user logged into Webmin can execute any command using special URL parameters. This could be used by less-privileged Webmin users to raise their level of access.
+ 
+ > Thanks for Keigo Yamazaki of Little eArth Corporation for finding this bug.
+
+### Webmin 1.374 and below, Usermin 1.277 and below
+#### XSS bug in `pam_login.cgi` script
+ - A malicious link to Webmin `pam_login.cgi` script can be used to execute JavaScript within the Webmin server context, and perhaps steal session cookies.
+
+### Webmin 1.330 and below, Usermin 1.260 and below
+#### XSS bug in `chooser.cgi` script
+ - When using Webmin or Usermin to browse files on a system that were created by an attacker, a specially crafted filename could be used to inject arbitrary JavaScript into the browser.
+
+### Webmin 1.296 and below, Usermin 1.226 and below
+#### Remote source code access
+- An attacker can view the source code of Webmin CGI and Perl programs using a specially crafted URL. Because the source code for Webmin is freely available, this issue should only be of concern to sites that have custom modules for which they want the source to remain hidden.
+#### XSS bug
+- The XSS bug makes use of a similar technique to craft a URL that can allow arbitrary JavaScript to be executed in the user's browser if a malicious link is clicked on.
+ 
+ > Thanks for Keigo Yamazaki of Little eArth Corporation for finding this bug.
+
+### Webmin 1.290 and below, Usermin 1.220 and below
+#### Arbitrary remote file access
+ - An attacker without a login to Webmin can read the contents of any file on the server using a specially crafted URL. All users should upgrade to version 1.290 as soon as possible, or setup IP access control in Webmin.
+ 
+ > Thanks to Kenny Chen for bringing this to my attention.
+
+### Webmin 1.280 and below
+#### Windows arbitrary file access
+ - If running Webmin on Windows, an attacker can remotely view the contents of any file on your system using a specially crafted URL. This does not affect other operating systems, but if you use Webmin on Windows you should upgrade to version 1.280 or later.
+ 
+ > Thanks to Keigo Yamazaki of Little eArth Corporation for discovering this bug.
+
+### Webmin 1.250 and below, Usermin 1.180 and below
+#### Perl syslog input attack
+ - When logging of failing login attempts via `syslog` is enabled, an attacker can crash and possibly take over the Webmin webserver, due to un-checked input being passed to Perl's `syslog` function. Upgrading to the latest release of Webmin is recommended.
+ 
+ > Thanks to Jack at Dyad Security for reporting this problem to me.
+
+### Webmin 1.220 and below, Usermin 1.150 and below
+#### Full PAM conversations' mode remote attack
+ - Affects systems when the option **Support full PAM conversations?** is enabled on the **Webmin ⇾ Webmin Configuration ⇾ Authentication** page. When this option is enabled in Webmin or Usermin, an attacker can gain remote access to Webmin without needing to supply a valid login or password. Fortunately this option is not enabled by default and is rarely used unless you have a PAM setup that requires more than just a username and password, but upgrading is advised anyway. <br />
+ 
+ > Thanks to Keigo Yamazaki of Little eArth Corporation and [JPCERT/CC][13] for discovering and notifying me of this bug.
+
+### Webmin 1.175 and below, Usermin 1.104 and below
+#### Brute force password guessing attack
+ - Prior Webmin and Usermin versions do not have password timeouts turned on by default, so an attacker can try every possible password for the _root_ or admin user until he/she finds the correct one.  
+The solution is to enable password timeouts, so that repeated attempts to login as the same user will become progressively slower. This can be done by following these steps :
+
+    * Go to the **Webmin Configuration** module.
+    * Click on the **Authentication** icon.
+    * Select the **Enable password timeouts** button.
+    * Click the **Save** button at the bottom of the page.
+ 
+   This problem is also present in Usermin, and can be prevented by following the same steps in the **Usermin Configuration** module.
+
+### Webmin 1.150 and below, Usermin 1.080 and below
+#### XSS vulnerability
+ - When viewing HTML email, several potentially dangerous types of URLs can be passed through. This can be used to perform malicious actions like executing commands as the logged-in Usermin user.
+
+#### Module configurations are visible
+- Even if a Webmin user does not have access to a module, he/she can still view it's Module Config page by entering a URL that calls `config.cgi` with the module name as a parameter.
+
+#### Account lockout attack
+- By sending a specially constructed password, an attacker can lock out other users if password timeouts are enabled.
+
+  [2]: https://github.com/bl4ckmenace
+  [3]: https://github.com/Pybro09
+  [4]: https://github.com/ly1g3
+  [5]: https://github.com/esp0xdeadbeef
+  [6]: https://github.com/V1s3r1on
+  [7]: https://github.com/faisalfs10x/
+  [8]: https://www.netbytesec.com/
+  [9]: https://twitter.com/Mesh3l_911
+  [10]: https://twitter.com/electronicbots
+  [12]: http://www.kb.cert.org/vuls/id/788478
+  [13]: http://www.jpcert.or.jp/
--- a/WebminCore.pm
+++ b/WebminCore.pm
--- a/acl/Authen-SolarisRBAC-0.1.tar.gz
+++ b/acl/Authen-SolarisRBAC-0.1.tar.gz
--- a/acl/acl-lib.pl
+++ b/acl/acl-lib.pl
@@ -11,7 +11,7 @@ Library for editing webmin users, passwords and access rights.

 =cut

-BEGIN { push(@INC, ".."); };
+BEGIN { push(@INC, ".."); };    ## no critic
 use strict;
 use warnings;
 no warnings 'redefine';
@@ -92,7 +92,6 @@ while(my $l = <$fh>) {
 		$user{'locale'} = $gconfig{"locale_$user[0]"};
 		$user{'dateformat'} = $gconfig{"dateformat_$user[0]"};
 		$user{'notabs'} = $gconfig{"notabs_$user[0]"};
-		$user{'rbacdeny'} = $gconfig{"rbacdeny_$user[0]"};
 		if ($gconfig{"theme_$user[0]"}) {
 			($user{'theme'}, $user{'overlay'}) =
 				split(/\s+/, $gconfig{"theme_$user[0]"});
@@ -353,7 +352,8 @@ each of which is a hash reference in the same format as their module.info files.
 sub list_module_infos
 {
 my @mods = grep { &check_os_support($_) } &get_all_module_infos();
-return sort { $a->{'desc'} cmp $b->{'desc'} } @mods;
+my @sorted = sort { $a->{'desc'} cmp $b->{'desc'} } @mods;
+return @sorted;
 }

 =head2 create_user(&details, [clone])
@@ -501,8 +501,6 @@ else {
 	$gconfig{"lang_".$user->{'name'}} = $user->{'lang'} if ($user->{'lang'});
 	delete($gconfig{"notabs_".$user->{'name'}});
 	$gconfig{"notabs_".$user->{'name'}} = $user->{'notabs'} if ($user->{'notabs'});
-	delete($gconfig{"rbacdeny_".$user->{'name'}});
-	$gconfig{"rbacdeny_".$user->{'name'}} = $user->{'rbacdeny'} if ($user->{'rbacdeny'});
 	delete($gconfig{"ownmods_".$user->{'name'}});
 	$gconfig{"ownmods_".$user->{'name'}} = join(" ", @{$user->{'ownmods'}})
 		if ($user->{'ownmods'} && @{$user->{'ownmods'}});
@@ -722,9 +720,6 @@ else {
 	delete($gconfig{"notabs_".$username});
 	$gconfig{"notabs_".$user->{'name'}} = $user->{'notabs'}
 		if ($user->{'notabs'});
-	delete($gconfig{"rbacdeny_".$username});
-	$gconfig{"rbacdeny_".$user->{'name'}} = $user->{'rbacdeny'}
-		if ($user->{'rbacdeny'});
 	delete($gconfig{"ownmods_".$username});
 	$gconfig{"ownmods_".$user->{'name'}} = join(" ", @{$user->{'ownmods'}})
 		if ($user->{'ownmods'} && @{$user->{'ownmods'}});
@@ -1337,12 +1332,12 @@ my ($miniserv) = @_;
 my $sfile = $miniserv->{'sessiondb'} ? $miniserv->{'sessiondb'} :
 	    $miniserv->{'pidfile'} =~ /^(.*)\/[^\/]+$/ ? "$1/sessiondb"
 						     : return;
-eval "use SDBM_File";
+eval { require SDBM_File; SDBM_File->import; 1 };
 dbmopen(%sessiondb, $sfile, 0700);
 eval { $sessiondb{'1111111111'} = 'foo bar' };
 if ($@) {
 	dbmclose(%sessiondb);
-	eval "use NDBM_File";
+	eval { require NDBM_File; NDBM_File->import; 1 };
 	dbmopen(%sessiondb, $sfile, 0700);
 	}
 else {
@@ -1428,16 +1423,158 @@ Creates a new session ID that's already logged in as the given user
 sub create_session_user
 {
 my ($miniserv, $username, $lifetime) = @_;
-return undef if (&is_readonly_mode());
+return if (&is_readonly_mode());
 &open_session_db($miniserv);
 my $sid = &generate_random_session_id();
-return undef if (!$sid);
+return if (!$sid);
 my $t = time();
 $sessiondb{$sid} = "$username $t 127.0.0.1".($lifetime ? " ".$lifetime : "");
 dbmclose(%sessiondb);
 return $sid;
 }

+=head2 set_module_access(&modules, enabled, [&users-groups])
+
+Grants or revokes Webmin module access for users and groups. The modules
+parameter must be an array ref of module names. The enabled flag should be
+1 to grant access, or 0 to revoke access. If the users-groups parameter is
+not given, all users and groups are updated. Otherwise, it must be an array
+ref of usernames and group names. Group names may be prefixed with @ to
+target only a group.
+
+Returns the number of directly updated user and group records.
+
+=cut
+sub set_module_access
+{
+my ($mods, $enabled, $usersgroups) = @_;
+$mods ||= [];
+return 0 if (!@$mods);
+my $set_module_access_list = sub {
+	my ($obj, $key, $addmods) = @_;
+	$addmods ||= $mods;
+	my @old = @{$obj->{$key} || []};
+	my @new;
+	if ($enabled) {
+		@new = &unique(@old, @$addmods);
+		}
+	else {
+		my %remove = map { $_, 1 } @$mods;
+		@new = grep { !$remove{$_} } @old;
+		}
+	return 0 if (join("\0", @old) eq join("\0", @new));
+	$obj->{$key} = \@new;
+	return 1;
+	};
+my $own_module_updates = sub {
+	my ($obj, $inherited) = @_;
+	return $mods if (!$enabled);
+	return [] if (!@{$obj->{'ownmods'} || []} && !@$inherited);
+	return [ grep { &indexof($_, @$inherited) < 0 } @$mods ];
+	};
+my @users = &list_users();
+my @groups = &list_groups();
+my $all = !defined($usersgroups);
+my (%target_user, %target_group);
+if (!$all) {
+	foreach my $ug (@$usersgroups) {
+		if ($ug =~ /^\@(.*)$/) {
+			$target_group{$1} = 1;
+			}
+		else {
+			$target_user{$ug} = 1;
+			$target_group{$ug} = 1;
+			}
+		}
+	}
+my $changed = 0;
+my (%user_group, %group_parent);
+foreach my $g (@groups) {
+	foreach my $m (@{$g->{'members'} || []}) {
+		if ($m =~ /^\@(.*)$/) {
+			$group_parent{$1} = $g;
+			}
+		else {
+			$user_group{$m} = $g;
+			}
+		}
+	}
+my (@ordered_groups, %ordered_group, %ordering_group);
+my $add_ordered_group;
+$add_ordered_group = sub {
+	my ($g) = @_;
+	return if (!$g || $ordered_group{$g->{'name'}});
+	return if ($ordering_group{$g->{'name'}}++);
+	$add_ordered_group->($group_parent{$g->{'name'}});
+	delete($ordering_group{$g->{'name'}});
+	push(@ordered_groups, $g);
+	$ordered_group{$g->{'name'}}++;
+	};
+foreach my $g (@groups) {
+	$add_ordered_group->($g);
+	}
+
+# Update groups first, so member users and sub-groups inherit the new set
+foreach my $g (@ordered_groups) {
+	next if (!$all && !$target_group{$g->{'name'}});
+	my $gchanged = 0;
+	my $parent = $group_parent{$g->{'name'}};
+	my $ownmods = $own_module_updates->(
+		$g, [ @{$parent ? $parent->{'modules'} || [] : []} ]);
+	$gchanged += $set_module_access_list->($g, "modules");
+	$gchanged += $set_module_access_list->($g, "ownmods", $ownmods);
+	if ($gchanged) {
+		&modify_group($g->{'name'}, $g);
+		&update_members(\@users, \@groups, $g->{'modules'},
+				$g->{'members'});
+		$changed++;
+		}
+	}
+
+# Update directly targeted users
+foreach my $u (@users) {
+	next if (!$all && !$target_user{$u->{'name'}});
+	my $uchanged = 0;
+	my $group = $user_group{$u->{'name'}};
+	my $ownmods = $own_module_updates->(
+		$u, [ @{$group ? $group->{'modules'} || [] : []} ]);
+	$uchanged += $set_module_access_list->($u, "modules");
+	$uchanged += $set_module_access_list->($u, "ownmods", $ownmods);
+	if ($uchanged) {
+		&modify_user($u->{'name'}, $u);
+		$changed++;
+		}
+	}
+
+if ($changed) {
+	undef(%main::acl_hash_cache);
+	undef(%main::acl_array_cache);
+	}
+return $changed;
+}
+
+=head2 enable_module_access(&modules, [&users-groups])
+
+Grants users and groups access to one or more modules. This is a wrapper
+around set_module_access.
+
+=cut
+sub enable_module_access
+{
+return &set_module_access($_[0], 1, $_[1]);
+}
+
+=head2 disable_module_access(&modules, [&users-groups])
+
+Revokes users and groups access to one or more modules. This is a wrapper
+around set_module_access.
+
+=cut
+sub disable_module_access
+{
+return &set_module_access($_[0], 0, $_[1]);
+}
+
 =head2 update_members(&allusers, &allgroups, &modules, &members)

 Update the modules for members users and groups of some group. The parameters
@@ -1699,7 +1836,7 @@ elsif (&has_command("ssleay")) {
 	return &has_command("ssleay");
 	}
 else {
-	return undef;
+	return;
 	}
 }

@@ -1815,6 +1952,7 @@ foreach my $g (&list_groups()) {
 		return $g;
 		}
 	}
+return;
 }

 =head2 check_password_restrictions(username, password)
@@ -1859,7 +1997,7 @@ if ($miniserv{'pass_oldblock'} && $user) {
 		last if ($c++ > $miniserv{'pass_oldblock'});
 		}
 	}
-return undef;
+return;
 }

 =head2 hash_session_id(sid)
@@ -1896,11 +2034,11 @@ my $use_md5 = &md5_perl_module();
 $use_md5 || &error("No Perl MD5 hashing module found!");

 # Add the password
-my $ctx = eval "new $use_md5";
+my $ctx = $use_md5->new;
 $ctx->add($passwd);

 # Add some more stuff from the hash of the password and salt
-my $ctx1 = eval "new $use_md5";
+my $ctx1 = $use_md5->new;
 $ctx1->add($passwd);
 $ctx1->add($passwd);
 my $final = $ctx1->digest();
@@ -1949,12 +2087,12 @@ Returns a Perl module for MD5 hashing, or undef if none.
 sub md5_perl_module
 {
 my $use_md5;
-eval "use MD5";
+eval { require MD5; MD5->import; 1 };
 if (!$@) {
        $use_md5 = "MD5";
        }
 else {
-        eval "use Digest::MD5";
+        eval { require Digest::MD5; Digest::MD5->import; 1 };
        if (!$@) {
                $use_md5 = "Digest::MD5";
                }
@@ -2111,16 +2249,16 @@ my ($str, $notablecheck) = @_;
 my ($proto, $user, $pass, $host, $prefix, $args) = &split_userdb_string($str);
 if ($proto eq "mysql" || $proto eq "postgresql") {
 	# Load DBI driver
-	eval 'use DBI;';
+	eval { require DBI; DBI->import; 1 };
 	return &text('sql_emod', 'DBI') if ($@);
 	if ($proto eq "mysql") {
-		eval 'use DBD::mysql;';
+		eval { require DBD::mysql; DBD::mysql->import; 1 };
 		return &text('sql_emod', 'DBD::mysql') if ($@);
 		my $drh = DBI->install_driver("mysql");
 		return $text{'sql_emysqldriver'} if (!$drh);
 		}
 	else {
-		eval 'use DBD::Pg;';
+		eval { require DBD::Pg; DBD::Pg->import; 1 };
 		return &text('sql_emod', 'DBD::Pg') if ($@);
 		my $drh = DBI->install_driver("Pg");
 		return $text{'sql_epostgresqldriver'} if (!$drh);
@@ -2152,11 +2290,11 @@ if ($proto eq "mysql" || $proto eq "postgresql") {
 			}
 		}
 	&disconnect_userdb($str, $dbh);
-	return undef;
+	return;
 	}
 elsif ($proto eq "ldap") {
 	# Load LDAP module
-	eval 'use Net::LDAP;';
+	eval { require Net::LDAP; Net::LDAP->import; 1 };
 	return &text('sql_emod', 'Net::LDAP') if ($@);

 	# Try to connect
@@ -2190,7 +2328,7 @@ elsif ($proto eq "ldap") {
 		$found || return &text('sql_eldapdn', $prefix);
 		}
 	&disconnect_userdb($str, $dbh);
-	return undef;
+	return;
 	}
 else {
 	return "Unknown user database type $proto";
@@ -2284,8 +2422,8 @@ if (!$miniserv) {
 	$miniserv = { };
 	&get_miniserv_config($miniserv);
 	}
-foreach $a (split(/\s+/, $miniserv->{'anonymous'})) {
-        if ($a =~ /^([^=]+)=(\S+)$/ && $2 eq $user) {
+foreach my $tok (split(/\s+/, $miniserv->{'anonymous'})) {
+        if ($tok =~ /^([^=]+)=(\S+)$/ && $2 eq $user) {
 		push(@rv, $1);
 		}
 	}
@@ -2299,7 +2437,7 @@ sub get_safe_acl
 my ($m) = @_;
 my $mdir = &module_root_directory($m);
 my %rv;
-&read_file_cached("$mdir/safeacl", \%rv) || return undef;
+&read_file_cached("$mdir/safeacl", \%rv) || return;
 return \%rv;
 }

@@ -2313,17 +2451,19 @@ sub generate_random_session_id
 my $sid;

 # Try /dev/urandom, but with a timeout
-$SIG{ALRM} = sub { close(RANDOM) };
+my $randomfh;
+$SIG{ALRM} = sub { close($randomfh) if ($randomfh) };
 alarm(5);
-if (open(RANDOM, "/dev/urandom")) {
+if (open($randomfh, "<", "/dev/urandom")) {
 	my $tmpsid;
-	if (read(RANDOM, $tmpsid, 16) == 16) {
+	if (read($randomfh, $tmpsid, 16) == 16) {
 		$sid = lc(unpack('h*',$tmpsid));
 		if ($sid !~ /^[0-9a-fA-F]{32}$/) {
 			$sid = 'bad';
 			}
 		}
-	close(RANDOM);
+	close($randomfh);
+	undef($randomfh);
 	}
 alarm(0);

@@ -2341,7 +2481,7 @@ return $sid eq 'bad' ? undef : $sid;
 # Generate an ID string that can be used for a password reset link
 sub generate_random_id
 {
-if (open(my $RANDOM, "</dev/urandom")) {
+if (open(my $RANDOM, "<", "/dev/urandom")) {
 	my $sid;
 	my $tmpsid;
 	if (read($RANDOM, $tmpsid, 16) == 16) {
@@ -2350,7 +2490,9 @@ if (open(my $RANDOM, "</dev/urandom")) {
 	close($RANDOM);
 	return $sid;
 	}
-return undef;
+# Explicit undef: callers consume this in hash-literal value position,
+# where bare 'return' would yield () and shift the surrounding pairing.
+return undef;    ## no critic (ProhibitExplicitReturnUndef)
 }

 # obsfucate_email(email)
@@ -2368,4 +2510,3 @@ return $mailbox."\@".join(".", @doms);
 }

 1;
-
--- a/acl/backup_config.pl
+++ b/acl/backup_config.pl
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require 'acl-lib.pl';
+require 'acl-lib.pl';    ## no critic
 our ($config_directory, %gconfig);

 # backup_config_files()
@@ -43,7 +43,7 @@ return @rv;
 # Called before the files are actually read
 sub pre_backup
 {
-return undef;
+return;
 }

 # post_backup(&files)
@@ -52,7 +52,7 @@ sub post_backup
 {
 unlink("$config_directory/config.aclbackup");
 unlink("$config_directory/miniserv.conf.aclbackup");
-return undef;
+return;
 }

 # pre_restore(&files)
@@ -66,7 +66,7 @@ foreach my $u (&list_users(), &list_groups()) {
 		       glob("$config_directory/*/$u->{'name'}.acl"));
 		}
 	}
-return undef;
+return;
 }

 # post_restore(&files)
@@ -101,7 +101,7 @@ foreach my $k (keys %aclbackup) {
 &put_miniserv_config(\%miniserv);

 &restart_miniserv();
-return undef;
+return;
 }

 1;
--- a/acl/cert_form.cgi
+++ b/acl/cert_form.cgi
@@ -5,11 +5,11 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 &ui_print_header(undef, $text{'cert_title'}, "", undef, undef, undef, undef,
 		 undef, undef, "language=VBSCRIPT onload='postLoad()'");
-eval "use Net::SSLeay";
+eval { require Net::SSLeay; Net::SSLeay->import; 1 };

 print "<p>$text{'cert_msg'}<p>\n";
 if ($ENV{'SSL_USER'}) {
--- a/acl/cert_issue.cgi
+++ b/acl/cert_issue.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $module_config_directory, $base_remote_user);
 &ReadParse();

--- a/acl/cert_output.cgi
+++ b/acl/cert_output.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);

 &ReadParse();
--- a/acl/cgi_args.pl
+++ b/acl/cgi_args.pl
@@ -27,5 +27,5 @@ elsif ($cgi eq 'edit_acl.cgi') {
 		}
 	return 'none';
 	}
-return undef;
+return;
 }
--- a/acl/convert.cgi
+++ b/acl/convert.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $config_directory);
 &ReadParse();
 &error_setup($text{'convert_err'});
--- a/acl/convert_form.cgi
+++ b/acl/convert_form.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 $access{'sync'} && $access{'create'} || &error($text{'convert_ecannot'});
 &ui_print_header(undef, $text{'convert_title'}, "");
--- a/acl/defaultacl
+++ b/acl/defaultacl
@@ -19,7 +19,6 @@ sessions=1
 cats=1
 ips=1
 switch=1
-rbacenable=1
 logouttime=1
 times=1
 minsize=1
--- a/acl/delete_group.cgi
+++ b/acl/delete_group.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $base_remote_user);
 &ReadParse();
 &error_setup($text{'gdelete_err'});
--- a/acl/delete_groups.cgi
+++ b/acl/delete_groups.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $base_remote_user);
 &ReadParse();
 &error_setup($text{'gdeletes_err'});
--- a/acl/delete_session.cgi
+++ b/acl/delete_session.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, %sessiondb);
 &ReadParse();
 $access{'sessions'} || &error($text{'sessions_ecannot'});
--- a/acl/delete_user.cgi
+++ b/acl/delete_user.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $base_remote_user);
 &ReadParse();
 &error_setup($text{'delete_err'});
--- a/acl/delete_users.cgi
+++ b/acl/delete_users.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $base_remote_user);
 &ReadParse();
 &error_setup($in{'joingroup'} ? $text{'udeletes_jerr'} : $text{'udeletes_err'});
--- a/acl/edit_acl.cgi
+++ b/acl/edit_acl.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $base_remote_user, %gconfig);
 &ReadParse();
 $access{'acl'} || &error($text{'acl_emod'});
@@ -48,15 +48,6 @@ else {
 	}
 print &ui_table_start(&text('acl_options', $minfo{'desc'}), "width=100%", 4);

-if ($in{'mod'} && $in{'user'} && &supports_rbac($in{'mod'}) &&
-    !$gconfig{'rbacdeny_'.$who}) {
-	# Show RBAC option
-	print &ui_table_row($text{'acl_rbac'},
-		&ui_radio("rbac", $maccess{'rbac'} ? 1 : 0,
-			[ [ 1, $text{'acl_rbacyes'} ],
-			  [ 0, $text{'no'} ] ]), 3);
-	}
-
 # Load custom ACL library
 my $mdir = &module_root_directory($in{'mod'});
 if (-r "$mdir/acl_security.pl") {
--- a/acl/edit_group.cgi
+++ b/acl/edit_group.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $config_directory);
 &ReadParse();
 $access{'groups'} || &error($text{'gedit_ecannot'});
--- a/acl/edit_pass.cgi
+++ b/acl/edit_pass.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'pass_ecannot'});
 &ui_print_header(undef, $text{'pass_title'}, "");
--- a/acl/edit_rbac.cgi
+++ b/acl/edit_rbac.cgi
@@ -1,32 +0,0 @@
-#!/usr/local/bin/perl
-# Show RBAC status
-
-use strict;
-use warnings;
-no warnings 'redefine';
-no warnings 'uninitialized';
-require './acl-lib.pl';
-our (%in, %text, %gconfig, %access, $module_name, $module_root_directory);
-$access{'rbacenable'} || &error($text{'rbac_ecannot'});
-&ui_print_header(undef, $text{'rbac_title'}, "");
-
-print "$text{'rbac_desc'}<p>\n";
-if ($gconfig{'os_type'} ne 'solaris') {
-	print &text('rbac_esolaris', $gconfig{'real_os_type'}),"<p>\n";
-	}
-elsif (!&supports_rbac()) {
-	if (&foreign_available("cpan")) {
-		print &text('rbac_eperl', "<tt>Authen::SolarisRBAC</tt>",
-			    "../cpan/download.cgi?source=0&local=$module_root_directory/Authen-SolarisRBAC-0.1.tar.gz&mode=2&return=/$module_name/&returndesc=".&urlize($text{'index_return'})),"<p>\n";
-		}
-	else {
-		print &text('rbac_ecpan', "<tt>Authen::SolarisRBAC</tt>"),
-		      "<p>\n";
-		}
-	}
-else {
-	print "$text{'rbac_ok'}<p>\n";
-	}
-
-&ui_print_footer("", $text{'index_return'});
-
--- a/acl/edit_sql.cgi
+++ b/acl/edit_sql.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 $access{'sql'} || &error($text{'sql_ecannot'});
 &ui_print_header(undef, $text{'sql_title'}, "");
--- a/acl/edit_sync.cgi
+++ b/acl/edit_sync.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 $access{'sync'} && $access{'create'} && $access{'delete'} ||
 	&error($text{'sync_ecannot'});
--- a/acl/edit_unix.cgi
+++ b/acl/edit_unix.cgi
@@ -7,7 +7,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 $access{'unix'} && $access{'create'} && $access{'delete'} ||
 	&error($text{'unix_ecannot'});
@@ -82,7 +82,7 @@ print &ui_table_row($text{'unix_restrict2'},
 print &ui_table_row("",
 	&ui_checkbox("shells_deny", 1, $text{'unix_shells'},
 		     $miniserv{'shells_deny'} ? 1 : 0)." ".
-	&ui_filebox("shells", $miniserv{'shells_deny'} || "/etc/shells", 40));
+	&ui_filebox("shells", $miniserv{'shells_deny'} || "/etc/shells", 25));

 print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'save'} ] ]);
--- a/acl/edit_user.cgi
+++ b/acl/edit_user.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %gconfig, %access, $config_directory, $base_remote_user, $remote_user);
 &foreign_require("webmin", "webmin-lib.pl");

@@ -42,6 +42,11 @@ else {
 				      : $text{'edit_title2'}, "");
 	}
 my $me = &get_user($base_remote_user);
+my %uaccess = &get_module_acl($in{'user'} || "", "", 1);
+if (!$in{'user'} && $uaccess{'rpc'} == 2) {
+	# Don't offer the confusing 'root' or 'admin' RPC option by default
+	$uaccess{'rpc'} = 0;
+	}

 # Give up if readonly
 if ($user{'readonly'} && !$in{'readwrite'}) {
@@ -210,7 +215,10 @@ if ($access{'lang'}) {

 if ($access{'locale'}) {
 	# Current locale
-	eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
+	eval { require DateTime; DateTime->import;
+	       require DateTime::Locale; DateTime::Locale->import;
+	       require DateTime::TimeZone; DateTime::TimeZone->import;
+	       1 };
 	if (!$@ && $] > 5.011) {
 		my $locales = &list_locales();
 		my %localesrev = reverse %{$locales};
@@ -238,6 +246,18 @@ my @themes = grep { !$_->{'overlay'} } @all;
 my @overlays = grep { $_->{'overlay'} } @all;

 if ($access{'theme'}) {
+	my $tconf_link;
+	my %tinfo = &webmin::get_theme_info($user{'theme'});
+	if ($user{'theme'} && $user{'theme'} eq $tinfo{'dir'} &&
+	    $user{'name'} eq $remote_user &&
+	    $tinfo{'config_link'}) {
+		$tconf_link = &ui_tag('span', &ui_link(
+			"@{[&get_webprefix()]}/$tinfo{'config_link'}",
+			&ui_tag('span', '⚙', 
+				{ class => 'theme-config-char',
+				  title => $text{'themes_configure'} }),
+			'text-link'), { style => 'position: relative;' });
+		}
 	# Current theme
 	my @topts = ( );
 	push(@topts, !$user{'theme'} ? [ '', $text{'edit_themedef'} ] : ());
@@ -247,7 +267,8 @@ if ($access{'theme'}) {
 	print &ui_table_row($text{'edit_theme'},
 		&ui_radio("theme_def", defined($user{'theme'}) ? 0 : 1,
 		  [ [ 1, $text{'edit_themeglobal'} ],
-		    [ 0, &ui_select("theme", $user{'theme'}, \@topts) ] ]));
+		    [ 0, &ui_select("theme", $user{'theme'}, \@topts).
+		    	 $tconf_link ] ]));
 	}

 if ($access{'theme'} && @overlays) {
@@ -267,7 +288,7 @@ if ($showui) {
 # Start of security options section
 my $showsecurity = $access{'logouttime'} || $access{'ips'} ||
 		   $access{'minsize'} ||
-		   &supports_rbac() && $access{'mode'} == 0 || $access{'times'};
+		   $access{'times'};
 if ($showsecurity) {
 	print &ui_hidden_table_start($text{'edit_security'}, "width=100%", 2,
 				     "security", 0, [ "width=30%" ]);
@@ -308,14 +329,6 @@ if ($access{'ips'}) {
 		    4, 30));
 	}

-if (&supports_rbac() && $access{'mode'} == 0) {
-	# Deny access to modules not managed by RBAC?
-	print &ui_table_row($text{'edit_rbacdeny'},
-		&ui_radio("rbacdeny", $user{'rbacdeny'} ? 1 : 0,
-			  [ [ 0, $text{'edit_rbacdeny0'} ],
-			    [ 1, $text{'edit_rbacdeny1'} ] ]));
-	}
-
 if ($access{'times'}) {
 	# Show allowed days of the week
 	my %days = map { $_, 1 } split(/,/, $user{'days'} || '');
@@ -358,6 +371,16 @@ elsif ($miniserv{'twofactor_provider'}) {
 		&ui_submit($text{'edit_twofactoradd'}, "twofactor"));
 	}

+# Can accept RPC calls?
+if ($access{'acl'} && !$safe) {
+	print &ui_table_row(&hlink($text{'acl_rpc'}, 'rpc'),
+		&ui_radio("rpc", int($uaccess{'rpc'}),
+			  [ [ 1, $text{'acl_rpc1'} ],
+			    $uaccess{'rpc'} == 2 ? ( [ 2, $text{'acl_rpc2'} ] ) : ( ),
+			    [ 3, $text{'acl_rpc3'} ],
+			    [ 0, $text{'acl_rpc0'} ] ]));
+	}
+
 print &ui_hidden_table_end("security");

 # Work out which modules can be selected
@@ -437,11 +460,9 @@ print &ui_hidden_table_end("mods");

 # Add global ACL section, but only if not set from the group
 my $groupglobal = $memg && -r "$config_directory/$memg->{'name'}.acl";
-if ($access{'acl'} && !$groupglobal && $in{'user'} && !$safe) {
+if ($access{'acl'} && !$groupglobal && !$safe) {
 	print &ui_hidden_table_start($text{'edit_global'}, "width=100%", 2,
 				     "global", 0, [ "width=30%" ]);
-	my %uaccess;
-	%uaccess = &get_module_acl($in{'user'}, "", 1);
 	print &ui_hidden("acl_security_form", 1);
 	&foreign_require("", "acl_security.pl");
 	&foreign_call("", "acl_security_form", \%uaccess);
--- a/acl/forgot_form.cgi
+++ b/acl/forgot_form.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text);
 &foreign_require("webmin");
 &error_setup($text{'forgot_err'});
--- a/acl/forgot_send.cgi
+++ b/acl/forgot_send.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %gconfig);
 &foreign_require("webmin");
 &error_setup($text{'forgot_err'});
--- a/acl/help/rpc.html
+++ b/acl/help/rpc.html
@@ -0,0 +1,14 @@
+<header>Can accept RPC calls?</header>
+
+This option determines if the user can make use of Webmin's poweful RPC calls
+feature, which is designed to allow this system to be controlled by a script
+or other Webmin server via HTTP. Because the RPC feature does <b>not</b>
+respect any module grants or fine-grained access controls, this option should
+only be enabled for fully trusted <tt>root</tt>-equivalent users. <p>
+
+In addition, if the <b>RPC calls only</b> option is selected, the user will not
+be able to use the Webmin UI. This is useful for creating a separate login with
+a longer password for RPC purposes only, as two-factor authentication cannot be
+used when making RPC calls. <p>
+
+<footer>
--- a/acl/images/rbac.gif
+++ b/acl/images/rbac.gif
--- a/acl/index.cgi
+++ b/acl/index.cgi
@@ -6,8 +6,8 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
-our (%in, %text, %config, %access, $base_remote_user);
+require './acl-lib.pl';    ## no critic
+our (%in, %text, %config, %gconfig, %access, $base_remote_user);
 &ReadParse();
 &ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1);

@@ -206,11 +206,6 @@ if (uc($ENV{'HTTPS'}) eq "ON" && $miniserv{'ca'}) {
 push(@icons, "images/twofactor.gif");
 push(@links, "twofactor_form.cgi");
 push(@titles, $text{'index_twofactor'});
-if ($access{'rbacenable'}) {
-	push(@icons, "images/rbac.gif");
-	push(@links, "edit_rbac.cgi");
-	push(@titles, $text{'index_rbac'});
-	}
 if ($access{'pass'}) {
 	push(@icons, "images/pass.gif");
 	push(@links, "edit_pass.cgi");
@@ -291,7 +286,13 @@ return &ui_checkbox("d", $user->{'name'}, "", 0).
       ($ro ? "<b>" : "").
       &ui_link("$cgi?$param=".&urlize($user->{'name'}),
 	        $user->{'name'}).
-       ($user->{'twofactor_id'} ? "*" : "").
+       ($user->{'twofactor_id'}
+       	? &ui_tag('sup', '⚷', 
+            { title => $text{'index_twofactor_enabled'},
+	      class => 'twofactor-enabled-icon',
+	      style => 'font-size: 11px; margin-left: 5px; cursor: default;'.
+                       'display: inline-block; transform: rotate(90deg);' } )
+	: "").
       ($ro ? "</b>" : "").
       ($lck ? "</i>" : "");
 }
--- a/acl/lang/ar.auto
+++ b/acl/lang/ar.auto
@@ -7,6 +7,7 @@ edit_readonly=This Webmin user should not be edited as it is managed by the $1 m
 edit_rights=Webmin حقوق وصول المستخدم
 edit_cloneof=استنساخ المستخدم Webmin
 edit_real=الاسم الحقيقي
+edit_email=البريد الإلكتروني للتواصل
 edit_group=عضو في المجموعة
 edit_pass=كلمه السر
 edit_same=نفس يونيكس
@@ -60,6 +61,7 @@ edit_selall=اختر الكل
 edit_invert=اختيار المقلوب
 edit_hide=إخفاء غير المستخدمة
 edit_switch=التبديل إلى المستخدم
+edit_forgot=إرسال رابط إعادة تعيين كلمة المرور
 edit_return=Webmin المستخدم
 edit_return2=مجموعة Webmin
 edit_rbacdeny=وضع الوصول RBAC
@@ -118,6 +120,7 @@ save_edays=لا أيام للسماح المحدد
 save_ehours=أوقات مفقودة أو غير صالحة للسماح بها
 save_ehours2=يجب أن يكون وقت البدء للسماح قبل النهاية
 save_etemp=The option to force a password change at next login cannot be used unless <a href='$1'>prompting users to enter new passwords</a> is enabled
+save_eemail=لا يمكن أن يحتوي عنوان البريد الإلكتروني على الحرف :

 cert_title=طلب شهادة
 cert_msg=يسمح لك هذا النموذج بطلب شهادة عميل SSL والتي سيتم استخدامها في المستقبل لمنحك حق الوصول إلى Webmin بدلاً من اسم المستخدم وكلمة المرور الخاصة بك. هذا أكثر أمانًا ، ولكن نظرًا لأن المصادقة تلقائية ، فلن تتمكن من التبديل إلى مستخدم مختلف عند استخدام الشهادة.
@@ -148,6 +151,9 @@ log_sync=تغيير تزامن المستخدم يونيكس
 log_sql=تم تغيير قاعدة بيانات المستخدم والمجموعة
 log_twofactor=Enrolled user $1 with two-factor provider $2
 log_onefactor=Dis-enrolled user $1 for two-factor authentication
+log_forgot_send=تم إرسال بريد إلكتروني لإعادة تعيين كلمة المرور للمستخدم $1 إلى $2
+log_forgot_reset=إعادة تعيين كلمة المرور للمستخدم $1 مع البريد الإلكتروني $2
+log_forgot_admin=أرسل المسؤول بريدًا إلكترونيًا لإعادة تعيين كلمة المرور للمستخدم $1 إلى $2

 gedit_ecannot=غير مسموح لك بتحرير المجموعات
 gedit_title=تحرير Webmin Group
@@ -363,3 +369,20 @@ sql_timeout_def=استخدام مهلة الاتصال الافتراضية (60
 sql_timeout_for=إغلاق الاتصالات المخبأة بعد
 sql_timeout_secs=ثواني
 sql_etimeout=يجب أن تكون مهلة الاتصال المخزنة مؤقتًا رقمًا
+
+forgot_title=إرسال رابط إعادة تعيين كلمة المرور
+forgot_err=فشل في إرسال رابط إعادة تعيين كلمة المرور
+forgot_header=تفاصيل رابط إعادة تعيين كلمة المرور
+forgot_user=إعادة تعيين كلمة المرور للمستخدم
+forgot_email=طريقة توصيل الرابط
+forgot_email_def=عرض الرابط في Webmin
+forgot_email_sel=أرسل الرابط عبر البريد الإلكتروني إلى
+forgot_send=إرسال الرابط
+forgot_desc=تتيح لك هذه الصفحة إنشاء أو إرسال رابط لاختيار كلمة مرور جديدة لمستخدم Webmin إلى أي عنوان بريد إلكتروني. انتبه جيدًا إلى عنوان البريد الإلكتروني الذي تُرسل إليه هذا الرابط، لأنه سيمنحك فعليًا حق الوصول الكامل إلى بيانات تسجيل الدخول إلى Webmin!
+forgot_adminmsg=لقد تلقيت هذا البريد الإلكتروني من مسؤول نظام Webmin في $3، لتسجيل الدخول $1.\n\nإذا كنت ترغب في المتابعة بإعادة تعيين كلمة المرور، فاتبع هذا الرابط:\n$2
+forgot_sending=إرسال بريد إلكتروني لإعادة تعيين كلمة المرور لـ $2 إلى $1 ..
+forgot_sent=.. مرسل
+forgot_link=يمكن استخدام الرابط أدناه لإعادة تعيين كلمة مرور Webmin لـ $1 للدقائق $2 القادمة :
+forgot_enosudo=Sudo غير متوفر على هذا النظام!
+forgot_ecansudo=المستخدم الذي تم إدخاله لا يملك صلاحيات sudo
+forgot_eunix=المستخدم القادر على استخدام sudo غير موجود!
--- a/acl/lang/bg.auto
+++ b/acl/lang/bg.auto
@@ -1,16 +1,23 @@
 index_screate=Създайте нов безопасен потребител.

 edit_title3=Създайте безопасен потребител на Webmin
+edit_email=Контактен имейл
 edit_locale=локал
+edit_forgot=Изпрати линк за нулиране на паролата
 edit_safe=Ниво на привилегии
 edit_safe0=неограничен
 edit_safe1=Само безопасни модули
 edit_unsafe=Нулиране до неограничено

 save_eunixname=Потребителското име '$1' не е потребител на Unix и затова не може да се използва в безопасен режим
+save_eemail=Имейл адресът не може да съдържа символа :

 acl_locale=Може ли да промени локала?

+log_forgot_send=Изпратен имейл за нулиране на паролата за потребител $1 до $2
+log_forgot_reset=Нулиране на паролата за потребител $1 с имейл $2
+log_forgot_admin=Администраторът изпрати имейл за нулиране на паролата за потребител $1 до $2
+
 sync_modify=Преименувайте съответстващия потребител на Webmin, когато потребител на Unix е преименуван.

 sessions_all=Всички сесии..
@@ -22,3 +29,20 @@ sql_timeout_def=Използвайте времето за изчакване н
 sql_timeout_for=Затворете кешираните връзки след
 sql_timeout_secs=секунди
 sql_etimeout=Времето за изчакване на кешираната връзка трябва да бъде число
+
+forgot_title=Изпрати линк за нулиране на паролата
+forgot_err=Изпращането на линк за нулиране на паролата не бе успешно
+forgot_header=Подробности за връзката за нулиране на паролата
+forgot_user=Нулиране на паролата за потребителя
+forgot_email=Метод за доставка на връзки
+forgot_email_def=Показване на линк в Webmin
+forgot_email_sel=Изпрати линк по имейл до
+forgot_send=Изпрати линк
+forgot_desc=Тази страница ви позволява да генерирате или изпратите линк, който може да се използва за избор на нова парола за потребител на Webmin, до произволен имейл адрес. Внимавайте на кой адрес изпращате този линк, тъй като той ефективно ще ви предостави пълен достъп до входа в Webmin!
+forgot_adminmsg=Получавате този имейл от администратора на системата Webmin на адрес $3, за вход $1.\n\nАко искате да продължите с нулирането на паролата, следвайте тази връзка:\n$2
+forgot_sending=Изпраща се имейл за нулиране на паролата за $2 до $1 ..
+forgot_sent=.. изпратен
+forgot_link=Връзката по-долу може да се използва за нулиране на паролата за Webmin за $1 за следващите $2 минути :
+forgot_enosudo=Sudo не е наличен на тази система!
+forgot_ecansudo=Въведеният потребител няма sudo разрешения
+forgot_eunix=Въведеният потребител, който поддържа sudo, не съществува!
--- a/acl/lang/ca.auto
+++ b/acl/lang/ca.auto
@@ -1,16 +1,23 @@
 index_screate=Creeu un nou usuari segur.

 edit_title3=Creeu un usuari Webmin segur
+edit_email=Correu electrònic de contacte
 edit_locale=Localització
+edit_forgot=Enviar enllaç de restabliment de contrasenya
 edit_safe=Nivell de privilegi
 edit_safe0=Sense restriccions
 edit_safe1=Només mòduls segurs
 edit_unsafe=Restableix-lo a sense restriccions

 save_eunixname=El nom d'usuari '$1' no és un usuari Unix, per la qual cosa no es pot utilitzar en mode segur
+save_eemail=L'adreça de correu electrònic no pot contenir el caràcter :

 acl_locale=Es pot canviar la configuració regional?

+log_forgot_send=S'ha enviat un correu electrònic de restabliment de contrasenya per a l'usuari $1 a $2
+log_forgot_reset=Restableix la contrasenya per a l'usuari $1 amb el correu electrònic $2
+log_forgot_admin=L'administrador ha enviat un correu electrònic de restabliment de contrasenya per a l'usuari $1 a $2
+
 sync_modify=Canvieu el nom de l'usuari Webmin coincident quan es canvia el nom d'un usuari Unix.

 sessions_all=Totes les sessions..
@@ -22,3 +29,20 @@ sql_timeout_def=Utilitza el temps d'espera de connexió predeterminat (60 segons
 sql_timeout_for=Tanqueu les connexions a la memòria cau després
 sql_timeout_secs=segons
 sql_etimeout=El temps d'espera de la connexió a la memòria cau ha de ser un número
+
+forgot_title=Enviar enllaç de restabliment de contrasenya
+forgot_err=No s'ha pogut enviar l'enllaç de restabliment de la contrasenya
+forgot_header=Detalls de l'enllaç de restabliment de contrasenya
+forgot_user=Restablir la contrasenya de l'usuari
+forgot_email=Mètode de lliurament d'enllaços
+forgot_email_def=Mostra l'enllaç a Webmin
+forgot_email_sel=Enviar enllaç per correu electrònic a
+forgot_send=Enviar enllaç
+forgot_desc=Aquesta pàgina us permet generar o enviar un enllaç que es pot utilitzar per seleccionar una nova contrasenya per a un usuari de Webmin a qualsevol adreça de correu electrònic. Aneu amb compte a quina adreça envieu aquest enllaç, ja que us atorgarà accés complet a l'inici de sessió de Webmin!
+forgot_adminmsg=Heu rebut aquest correu electrònic de l'administrador del sistema Webmin a $3, per a l'inici de sessió $1.\n\nSi voleu continuar amb el restabliment de la contrasenya, seguiu aquest enllaç:\n$2
+forgot_sending=Enviant un correu electrònic de restabliment de contrasenya de $2 a $1. ..
+forgot_sent=.. enviat
+forgot_link=L'enllaç següent es pot utilitzar per restablir la contrasenya de Webmin per a $1 durant els propers $2 minuts :
+forgot_enosudo=El Sudo no està disponible en aquest sistema!
+forgot_ecansudo=L'usuari introduït no té permisos de sudo
+forgot_eunix=L'usuari amb capacitat per a sudo introduït no existeix!
--- a/acl/lang/cs.auto
+++ b/acl/lang/cs.auto
@@ -5,6 +5,7 @@ index_eulist=Seznam uživatelů se nepodařilo uvést: $1
 index_eglist=Seznam se nezdařil: $1

 edit_title3=Vytvořte bezpečného webmin uživatele
+edit_email=Kontaktní e-mail
 edit_twofactor=Typ dvoufaktorové autentizace
 edit_twofactorprov=Použití poskytovatele $1 s ID $2
 edit_twofactorcancel=Odstraňte požadavek na dvoufaktorovou autentizaci
@@ -15,6 +16,7 @@ edit_nochange=Vynutit dny změny hesla?
 edit_egone=Vybraný uživatel již neexistuje!
 edit_overlay=Překrytí osobního motivu
 edit_overlayglobal=Žádné - použijte výchozí nastavení motivu
+edit_forgot=Odeslat odkaz pro obnovení hesla
 edit_global=Oprávnění pro všechny moduly
 edit_temppass=Vynutit změnu při příštím přihlášení
 edit_proto=Typ úložiště
@@ -30,6 +32,7 @@ edit_unsafe=Obnovit na neomezené
 save_eunixname=Uživatelské jméno '$1' není uživatel Unixu, a proto jej nelze použít v nouzovém režimu
 save_eoverlay=Překrytí motivu nelze vybrat, pokud není motivem
 save_etemp=Možnost vynutit změnu hesla při příštím přihlášení nelze použít, pokud není povoleno <a href='$1'>vyzývající uživatele k zadání nových hesel</a>
+save_eemail=E-mailová adresa nesmí obsahovat znak :

 delete_eanonuser=Tento uživatel je používán pro anonymní přístup k modulu

@@ -43,6 +46,9 @@ log_joingroup=Přidáno $1 Webmin users do skupiny $2
 log_sql=Změněna databáze uživatelů a skupin
 log_twofactor=Registrovaný uživatel $1 s dvoufaktorovým poskytovatelem $2
 log_onefactor=Registrovaný uživatel $1 pro dvoufaktorové ověření
+log_forgot_send=E-mail pro resetování hesla odeslán uživateli $1 uživateli $2
+log_forgot_reset=Obnovení hesla pro uživatele $1 s e-mailem $2
+log_forgot_admin=Administrátor odeslal e-mail s resetováním hesla pro uživatele $1 uživateli $2

 gedit_desc=Popis skupiny
 gedit_egone=Vybraná skupina již neexistuje!
@@ -161,3 +167,20 @@ twofactor_failed=.. zápis se nezdařil: $1
 twofactor_done=.. kompletní. Vaše ID u tohoto poskytovatele je <tt>$1</tt>.
 twofactor_setup=V tomto systému zatím není aktivována dvoufaktorová autentizace, ale lze ji zapnout pomocí modulu <a href='$1'>Webmin Configuration</a>.
 twofactor_ebutton=Nebylo kliknuto žádné tlačítko!
+
+forgot_title=Odeslat odkaz pro obnovení hesla
+forgot_err=Odeslání odkazu pro obnovení hesla se nezdařilo
+forgot_header=Podrobnosti o odkazu pro resetování hesla
+forgot_user=Obnovit heslo pro uživatele
+forgot_email=Způsob doručení odkazu
+forgot_email_def=Zobrazit odkaz ve Webminu
+forgot_email_sel=Odeslat odkaz e-mailem na
+forgot_send=Odeslat odkaz
+forgot_desc=Tato stránka vám umožňuje vygenerovat nebo odeslat odkaz, který lze použít k výběru nového hesla pro uživatele Webminu, na libovolnou e-mailovou adresu. Buďte opatrní, na kterou adresu tento odkaz odesíláte, protože vám v podstatě poskytne plný přístup k přihlášení do Webminu!
+forgot_adminmsg=Tento e-mail vám byl zaslán od administrátora systému Webmin na adrese $3 pro přihlášení $1.\n\nPokud chcete pokračovat v resetování hesla, klikněte na tento odkaz:\n$2
+forgot_sending=Odesílání e-mailu pro resetování hesla pro $2 na $1 ..
+forgot_sent=.. odesláno
+forgot_link=Níže uvedený odkaz lze použít k resetování hesla Webmin pro $1 na následujících $2 minut :
+forgot_enosudo=Sudo není na tomto systému k dispozici!
+forgot_ecansudo=Zadaný uživatel nemá oprávnění sudo
+forgot_eunix=Zadaný uživatel s podporou sudo neexistuje!
--- a/acl/lang/da.auto
+++ b/acl/lang/da.auto
@@ -1,16 +1,23 @@
 index_screate=Opret en ny sikker bruger.

 edit_title3=Opret sikker webmin-bruger
+edit_email=Kontakt e-mail
 edit_locale=Lokalitet
+edit_forgot=Send link til nulstilling af adgangskode
 edit_safe=Privilegieniveau
 edit_safe0=Ubegrænset
 edit_safe1=Kun sikre moduler
 edit_unsafe=Nulstil til ubegrænset

 save_eunixname=Brugernavnet '$1' er ikke en Unix-bruger, og kan derfor ikke bruges i sikker tilstand
+save_eemail=E-mailadressen må ikke indeholde tegnet:

 acl_locale=Kan du ændre lokalitet?

+log_forgot_send=Sendte e-mail om nulstilling af adgangskode for bruger $1 til $2
+log_forgot_reset=Nulstil adgangskode for bruger $1 med e-mail $2
+log_forgot_admin=Admin sendte en e-mail med nulstilling af adgangskode for bruger $1 til $2
+
 sync_modify=Omdøb den matchende Webmin-bruger, når en Unix-bruger omdøbes.

 sessions_all=Alle sessioner..
@@ -22,3 +29,20 @@ sql_timeout_def=Brug standardforbindelse timeout (60 sekunder)
 sql_timeout_for=Luk cachelagrede forbindelser efter
 sql_timeout_secs=sekunder
 sql_etimeout=Timeout for cachelagret forbindelse skal være et tal
+
+forgot_title=Send link til nulstilling af adgangskode
+forgot_err=Kunne ikke sende link til nulstilling af adgangskode
+forgot_header=Detaljer om link til nulstilling af adgangskode
+forgot_user=Nulstil adgangskode for bruger
+forgot_email=Linkleveringsmetode
+forgot_email_def=Vis link i Webmin
+forgot_email_sel=Send link via e-mail til
+forgot_send=Send link
+forgot_desc=Denne side giver dig mulighed for at generere eller sende et link, der kan bruges til at vælge en ny adgangskode til en Webmin-bruger, til en hvilken som helst e-mailadresse. Vær forsigtig med, hvilken adresse du sender dette link til, da det effektivt vil give fuld adgang til Webmin-login!
+forgot_adminmsg=Du modtager denne e-mail fra administratoren af Webmin-systemet på $3, for login $1.\n\nHvis du vil fortsætte med at nulstille adgangskoden, skal du følge dette link:\n$2
+forgot_sending=Sender e-mail om nulstilling af adgangskode for $2 til $1 ..
+forgot_sent=.. sendt
+forgot_link=Linket nedenfor kan bruges til at nulstille Webmin-adgangskoden for $1 i de næste $2 minutter :
+forgot_enosudo=Sudo er ikke tilgængelig på dette system!
+forgot_ecansudo=Den indtastede bruger har ikke sudo-tilladelser
+forgot_eunix=Den indtastede sudo-kompatible bruger findes ikke!
--- a/acl/lang/el.auto
+++ b/acl/lang/el.auto
@@ -1,16 +1,23 @@
 index_screate=Δημιουργήστε ένα νέο ασφαλές χρήστη.

 edit_title3=Δημιουργία ασφαλούς χρήστη Webmin
+edit_email=Ηλεκτρονική διεύθυνση επικοινωνίας
 edit_locale=Μικρός λοβός
+edit_forgot=Αποστολή συνδέσμου επαναφοράς κωδικού πρόσβασης
 edit_safe=Επίπεδο προνομίου
 edit_safe0=Απεριόριστος
 edit_safe1=Μόνο ασφαλή μονάδες
 edit_unsafe=Επαναφορά σε απεριόριστη

 save_eunixname=Το όνομα χρήστη '$1' δεν είναι χρήστης Unix και έτσι δεν μπορεί να χρησιμοποιηθεί σε ασφαλή λειτουργία
+save_eemail=Η διεύθυνση ηλεκτρονικού ταχυδρομείου δεν μπορεί να περιέχει τον χαρακτήρα :

 acl_locale=Μπορεί να αλλάξει τοπική;

+log_forgot_send=Αποστολή email επαναφοράς κωδικού πρόσβασης για τον χρήστη $1 στον χρήστη $2
+log_forgot_reset=Επαναφορά κωδικού πρόσβασης για τον χρήστη $1 με email $2
+log_forgot_admin=Ο διαχειριστής έστειλε email επαναφοράς κωδικού πρόσβασης για τον χρήστη $1 στον χρήστη $2
+
 sync_modify=Μετονομάστε τον αντίστοιχο χρήστη Webmin όταν μετονομάζεται ένας χρήστης Unix.

 sessions_all=Όλες οι συνεδρίες..
@@ -22,3 +29,20 @@ sql_timeout_def=Χρήση προεπιλεγμένου χρονικού ορί
 sql_timeout_for=Κλείστε τις προσωρινά αποθηκευμένες συνδέσεις μετά
 sql_timeout_secs=δευτερόλεπτα
 sql_etimeout=Το χρονικό όριο λήξης της προσωρινής αποθήκευσης πρέπει να είναι αριθμός
+
+forgot_title=Αποστολή συνδέσμου επαναφοράς κωδικού πρόσβασης
+forgot_err=Αποτυχία αποστολής συνδέσμου επαναφοράς κωδικού πρόσβασης
+forgot_header=Λεπτομέρειες συνδέσμου επαναφοράς κωδικού πρόσβασης
+forgot_user=Επαναφορά κωδικού πρόσβασης για τον χρήστη
+forgot_email=Μέθοδος παράδοσης συνδέσμου
+forgot_email_def=Εμφάνιση συνδέσμου στο Webmin
+forgot_email_sel=Αποστολή συνδέσμου μέσω email στο
+forgot_send=Αποστολή συνδέσμου
+forgot_desc=Αυτή η σελίδα σάς επιτρέπει να δημιουργήσετε ή να στείλετε έναν σύνδεσμο που μπορεί να χρησιμοποιηθεί για την επιλογή ενός νέου κωδικού πρόσβασης για έναν χρήστη Webmin σε οποιαδήποτε διεύθυνση email. Να είστε προσεκτικοί σε ποια διεύθυνση στέλνετε αυτόν τον σύνδεσμο, καθώς ουσιαστικά θα παρέχει πλήρη πρόσβαση στα στοιχεία σύνδεσης του Webmin!
+forgot_adminmsg=Λαμβάνετε αυτό το email από τον διαχειριστή του συστήματος Webmin στο $3, για τη σύνδεση $1.\n\nΕάν θέλετε να προχωρήσετε στην επαναφορά του κωδικού πρόσβασης, ακολουθήστε αυτόν τον σύνδεσμο:\n$2
+forgot_sending=Αποστολή email επαναφοράς κωδικού πρόσβασης για $2 σε $1 ..
+forgot_sent=.. έστειλε
+forgot_link=Ο παρακάτω σύνδεσμος μπορεί να χρησιμοποιηθεί για την επαναφορά του κωδικού πρόσβασης Webmin για το $1 για τα επόμενα $2 λεπτά :
+forgot_enosudo=Το Sudo δεν είναι διαθέσιμο σε αυτό το σύστημα!
+forgot_ecansudo=Ο χρήστης που καταχωρήθηκε δεν έχει δικαιώματα sudo
+forgot_eunix=Ο χρήστης με δυνατότητα sudo που καταχωρήσατε δεν υπάρχει!
--- a/acl/lang/en
+++ b/acl/lang/en
@@ -6,6 +6,7 @@ index_screate=Create a new safe user.
 index_convert=Convert Unix To Webmin Users
 index_cert=Request an SSL Certificate
 index_twofactor=Two-Factor Authentication
+index_twofactor_enabled=Two-factor authentication is enabled for this user
 index_certmsg=Click this button to request an SSL certificate that will allow you to securely login to Webmin without having to enter a username and password.
 index_return=user list
 index_none=None
@@ -22,7 +23,6 @@ index_modgroups=Modules from group $1
 index_sync=Configure Unix User Synchronization
 index_unix=Configure Unix User Authentication
 index_sessions=View Login Sessions
-index_rbac=Setup RBAC
 index_delete=Delete Selected
 index_joingroup=Add To Group:
 index_eulist=Failed to list users : $1
@@ -94,9 +94,6 @@ edit_switch=Switch to User
 edit_forgot=Send Password Reset Link
 edit_return=Webmin user
 edit_return2=Webmin group
-edit_rbacdeny=RBAC access mode
-edit_rbacdeny0=RBAC only controls selected module ACLs
-edit_rbacdeny1=RBAC controls all modules and ACLs
 edit_global=Permissions for all modules
 edit_templock=Temporarily locked
 edit_temppass=Force change at next login
@@ -184,8 +181,6 @@ acl_title3=For group $1 in $2
 acl_options=$1 access control options
 acl_config=Can edit module configuration?
 acl_reset=Reset To Full Access
-acl_rbac=Get access control settings from RBAC?
-acl_rbacyes=Yes (overrides settings below)

 acl_uall=All users
 acl_uthis=This user
@@ -355,18 +350,19 @@ unix_utable=Allowed Unix users
 sessions_title=Current Login Sessions
 sessions_id=Session ID
 sessions_user=Webmin user
+sessions_login_ago=Last active ago
 sessions_login=Last active at
 sessions_host=IP address
-sessions_lview=View logs..
-sessions_actions=Actions..
-sessions_all=All sessions..
-sessions_logouts=Also show logged-out sessions..
+sessions_lview=View logs
+sessions_actions=Actions
+sessions_all=All sessions
+sessions_logouts=Also show logged-out sessions
 sessions_state=State
 sessions_action=Actions
 sessions_this=This login
 sessions_in=Logged in
 sessions_out=Logged out
-sessions_kill=Disconnect..
+sessions_kill=Disconnect

 logins_title=Recent Webmin logins

@@ -380,13 +376,6 @@ hide_clone=(Clone $1)
 switch_euser=You are not allowed to switch to this user
 switch_eold=Existing session not found!

-rbac_title=Setup RBAC
-rbac_desc=Webmin's RBAC integration provides a way for user module and ACL permissions to be determined from an RBAC (Role Based Access Control) database, rather than Webmin's own configuration files. Once RBAC support is enabled, any user for whom the <b>RBAC controls all modules and ACLs</b> option is selected will have his capabilities determined by RBAC rather than Webmin's own access control settings.
-rbac_esolaris=RBAC is only supported on Solaris at the moment, and so cannot be used on this $1 system.
-rbac_eperl=The Perl module $1 needed for RBAC integration is not installed. <a href='$2'>Click here</a> to have it installed now.
-rbac_ecpan=You do not have access to Webmin's Perl Modules page in order to install the necessary $1 module for RBAC integration.
-rbac_ok=RBAC integration is available on this system, and can be enabled on a per-user basis on the Edit Webmin User page.
-
 udeletes_err=Failed to delete users
 udeletes_jerr=Failed to add users to group
 udeletes_enone=None selected
@@ -512,9 +501,18 @@ twofactor_enable=Enroll For Two-Factor Authentication
 twofactor_header=Two-factor authentication enrollment details
 twofactor_enrolling=Enrolling for two-factor authentication with provider $1 ..
 twofactor_failed=.. enrollment failed : $1
-twofactor_done=.. complete. Your ID with this provider is <tt>$1</tt>.
+twofactor_done=.. completed, with ID <tt>$1</tt>
 twofactor_setup=Two-factor authentication has not been enabled on this system yet, but can be turned on using the <a href='$1'>Webmin Configuration</a> module.
 twofactor_ebutton=No button clicked!
+twofactor_testdesc=Before logging out, you can test your new two-factor authentication setup here by entering a token. If for some reason it doesn't work, turn off two-factor authentication and try setting it up again.
+twofactor_testfield=Two-factor token
+twofactor_test=Validate Token
+twofactor_terr=Failed to test two-factor setup
+twofactor_etestuser=Login does not have two-factor enabled!
+twofactor_testing=Testing two-factor validation with $1 ..
+twofactor_testfailed=.. test failed! Maybe the wrong token was entered, or your authentication app has not been configured correctly?
+twofactor_testok=.. test passed! You can now safely login using two-factor authentication.
+twofactor_testdis=Disable Two-Factor Now

 forgot_title=Send Password Reset Link
 forgot_err=Failed to send password reset link
--- a/acl/lang/es.auto
+++ b/acl/lang/es.auto
@@ -1,18 +1,25 @@
 index_screate=Crea un nuevo usuario seguro.

 edit_title3=Crear usuario seguro de Webmin
+edit_email=Correo electrónico de contacto
 edit_locale=Lugar
+edit_forgot=Enviar enlace de restablecimiento de contraseña
 edit_safe=Nivel de privilegio
 edit_safe0=Irrestricto
 edit_safe1=Solo módulos seguros
 edit_unsafe=Restablecer a sin restricciones

 save_eunixname=El nombre de usuario '$1' no es un usuario de Unix, por lo que no se puede usar en modo seguro
+save_eemail=La dirección de correo electrónico no puede contener el carácter :

 delete_eanonuser=Este usuario se está utilizando para acceder al módulo anónimo

 acl_locale=¿Se puede cambiar de ubicación?

+log_forgot_send=Se envió un correo electrónico de restablecimiento de contraseña para el usuario $1 a $2
+log_forgot_reset=Restablecer la contraseña del usuario $1 con el correo electrónico $2
+log_forgot_admin=El administrador envió un correo electrónico de restablecimiento de contraseña para el usuario $1 a $2
+
 sync_modify=Cambie el nombre del usuario de Webmin coincidente cuando se cambie el nombre de un usuario de Unix.

 sessions_actions=Comportamiento..
@@ -35,3 +42,20 @@ sql_timeout_def=Usar tiempo de espera de conexión predeterminado (60 segundos)
 sql_timeout_for=Cerrar las conexiones en caché después
 sql_timeout_secs=segundos
 sql_etimeout=El tiempo de espera de la conexión en caché debe ser un número
+
+forgot_title=Enviar enlace de restablecimiento de contraseña
+forgot_err=No se pudo enviar el enlace de restablecimiento de contraseña
+forgot_header=Detalles del enlace de restablecimiento de contraseña
+forgot_user=Restablecer contraseña para el usuario
+forgot_email=Método de entrega del enlace
+forgot_email_def=Mostrar enlace en Webmin
+forgot_email_sel=Enviar enlace por correo electrónico a
+forgot_send=Enviar enlace
+forgot_desc=Esta página le permite generar o enviar un enlace a cualquier dirección de correo electrónico para seleccionar una nueva contraseña para un usuario de Webmin. Tenga cuidado con la dirección a la que envía este enlace, ya que otorgará acceso completo al inicio de sesión de Webmin
+forgot_adminmsg=Estás recibiendo este correo electrónico del administrador del sistema Webmin en $3, para el inicio de sesión $1.\n\nSi deseas continuar con el restablecimiento de la contraseña, sigue este enlace:\n$2
+forgot_sending=Enviando correo electrónico de restablecimiento de contraseña de $2 a $1 ..
+forgot_sent=.. enviado
+forgot_link=El siguiente enlace se puede utilizar para restablecer la contraseña de Webmin para $1 durante los próximos $2 minutos :
+forgot_enosudo=¡Sudo no está disponible en este sistema!
+forgot_ecansudo=El usuario ingresado no tiene permisos de sudo
+forgot_eunix=¡El usuario con capacidad sudo ingresado no existe!
--- a/acl/lang/eu.auto
+++ b/acl/lang/eu.auto
@@ -6,6 +6,7 @@ index_eulist=Ezin izan da erabiltzaileak zerrendatu: $1
 index_eglist=Huts egin du taldeen zerrendak: $1

 edit_title3=Sortu Webmin erabiltzaile segurua
+edit_email=Harremanetarako helbide elektronikoa
 edit_twofactor=Bi faktoreen autentikazio mota
 edit_twofactorprov=Hornitzailea $1 erabiliz $2
 edit_twofactorcancel=Kendu bi faktoreen autentikazio baldintza
@@ -14,6 +15,7 @@ edit_twofactoradd=Gaitu erabiltzailearentzako bi faktore
 edit_locale=Tokikoa
 edit_egone=Aukeratutako erabiltzailea ez da existitzen!
 edit_overlay=Gai pertsonalen gainjartzea
+edit_forgot=Pasahitza berrezartzeko esteka bidali
 edit_proto=Biltegiratze mota
 edit_proto_mysql=MySQL datu-basea
 edit_proto_postgresql=PostgreSQL datu-basea
@@ -26,6 +28,7 @@ edit_unsafe=Berrezarri mugarik gabekoetara

 save_eunixname='$1' erabiltzailea ez da Unix erabiltzailea eta, beraz, ezin da modu seguruan erabili
 save_etemp=Pasahitz aldaketa hurrengo behartzeko aukera ezin da erabili <a href='$1'>erabiltzaileek pasahitz berriak sartzeko eskatuko duten</a> gaituta ez badago
+save_eemail=Helbide elektronikoak ezin du izan: karakterea

 delete_eanonuser=Erabiltzaile hau modulu anonimoetarako sarbidea erabiltzen ari da

@@ -39,6 +42,9 @@ log_joingroup=Gehitu dira $1 Webmin erabiltzaileak $2
 log_sql=Erabiltzaileen eta taldeen datu baseak aldatu dira
 log_twofactor=Matrikulatutako erabiltzailea $1 bi faktore hornitzaile $2
 log_onefactor=Bi erabiltzaileak bi faktoreen autentikaziorako matrikulatutako erabiltzailea $1
+log_forgot_send=$1etik $2ra bitarteko erabiltzailearentzako pasahitza berrezartzeko mezu elektronikoa bidali da
+log_forgot_reset=Berrezarri $1 erabiltzailearen pasahitza, $2 helbide elektronikoarekin
+log_forgot_admin=Administratzaileak $1 erabiltzailearentzako pasahitza berrezartzeko mezu elektronikoa bidali du $2 erabiltzaileari

 gedit_desc=Taldearen deskribapena
 gedit_egone=Hautatutako taldea ez dago jada!
@@ -156,3 +162,20 @@ twofactor_failed=.. matrikulazioak huts egin du: $1
 twofactor_done=.. osatu. Hornitzaile honen IDa <tt>$1</tt> da.
 twofactor_setup=Bi faktoreen autentikazioa ez da gaituta oraindik sistema honetan, baina <a href='$1'>Webmin Konfigurazioa</a> modulua erabilita aktibatu daiteke.
 twofactor_ebutton=Ez da botoia sakatu!
+
+forgot_title=Pasahitza berrezartzeko esteka bidali
+forgot_err=Pasahitza berrezartzeko esteka bidaltzea huts egin da
+forgot_header=Pasahitza berrezartzeko estekaren xehetasunak
+forgot_user=Erabiltzailearen pasahitza berrezarri
+forgot_email=Esteka bidaltzeko metodoa
+forgot_email_def=Erakutsi esteka Webminen
+forgot_email_sel=Bidali esteka posta elektronikoz helbide honetara:
+forgot_send=Bidali esteka
+forgot_desc=Orrialde honek Webmin erabiltzaile baten pasahitz berri bat edozein helbide elektronikotara hautatzeko erabil daitekeen esteka bat sortu edo bidaltzeko aukera ematen dizu. Kontuz ibili esteka hau zein helbidetara bidaltzen duzun, Webmin saioa hasteko sarbide osoa emango dizulako!
+forgot_adminmsg=$3 helbideko Webmin sistemaren administratzailearengandik jaso duzu mezu elektroniko hau, $1 saioa hasteko.\n\nPasahitza berrezarri nahi baduzu, jarraitu esteka honi:\n$2
+forgot_sending=$2-ren pasahitza berrezartzeko mezu elektronikoa $1-era bidaltzen. ..
+forgot_sent=... bidalita
+forgot_link=Beheko esteka erabil daiteke $1-en Webmin pasahitza hurrengo $2 minutuetarako berrezartzeko :
+forgot_enosudo=Sudo ez dago eskuragarri sistema honetan!
+forgot_ecansudo=Sartutako erabiltzaileak ez du sudo baimenik
+forgot_eunix=Sartutako sudo gaitasuna duen erabiltzailea ez da existitzen!
--- a/acl/lang/fa.auto
+++ b/acl/lang/fa.auto
@@ -8,6 +8,7 @@ edit_title3=کاربر وبمین ایمن ایجاد کنید
 edit_readonly=This Webmin user should not be edited as it is managed by the $1 module. <a href='$2'>Click here</a> to bypass this warning and edit the user anyway - but beware that any manual changes may be over-written!
 edit_cloneof=کلونینگ کاربر وبمین
 edit_real=اسم واقعی
+edit_email=ایمیل تماس
 edit_passlocked=Password has not been changed for $1 days - account locked!
 edit_passmax=Password has not been changed for $1 days - must be changed at next login
 edit_passold=Password was last changed $1 days ago
@@ -26,6 +27,7 @@ edit_nochange=روزهای تغییر رمز عبور را اجرا می کنی
 edit_egone=کاربر انتخاب شده دیگر وجود ندارد!
 edit_overlay=پوشش شخصی موضوع
 edit_overlayglobal=هیچ یک - از پیش فرض های موضوعی استفاده نکنید
+edit_forgot=ارسال لینک بازیابی رمز عبور
 edit_global=مجوز برای همه ماژول ها
 edit_templock=به طور موقت قفل شده است
 edit_temppass=تغییر نیرو در ورود بعدی
@@ -58,6 +60,7 @@ save_edays=هیچ روز اجازه انتخاب وجود ندارد
 save_ehours=بارهای نامعتبر یا نامعتبر است
 save_ehours2=زمان شروع اجازه باید قبل از پایان باشد
 save_etemp=The option to force a password change at next login cannot be used unless <a href='$1'>prompting users to enter new passwords</a> is enabled
+save_eemail=آدرس ایمیل نمی‌تواند شامل کاراکتر : باشد

 delete_eanonuser=این کاربر برای دسترسی به ماژول ناشناس استفاده می شود

@@ -78,6 +81,9 @@ log_sync=همگام سازی کاربر یونیکس تغییر کرده است
 log_sql=بانک اطلاعاتی کاربر و گروه تغییر یافت
 log_twofactor=Enrolled user $1 with two-factor provider $2
 log_onefactor=Dis-enrolled user $1 for two-factor authentication
+log_forgot_send=ایمیل بازنشانی رمز عبور برای کاربران $1 تا $2 ارسال شد
+log_forgot_reset=بازنشانی رمز عبور برای کاربر $1 با ایمیل $2
+log_forgot_admin=مدیر ایمیل بازنشانی رمز عبور را برای کاربران $1 تا $2 ارسال کرد

 gedit_desc=توضیحات گروه
 gedit_egone=گروه منتخب دیگر وجود ندارد!
@@ -153,7 +159,7 @@ pass_maxdays=روزهای قبل باید رمزعبور تغییر کند
 pass_lockdays=روزها قبل از تغییر حساب قفل رمز عبور بدون تغییر
 pass_nomaxdays=تغییر هرگز مورد نیاز نیست
 pass_nolockdays=حساب هرگز قفل نیست
-pass_nouser=Ú¯Ø°Ø±ÙØ§ÚÙ‌ÙØ§Û ØØ§ÙÛ ÙØ§Ù Ú©Ø§Ø±Ø¨Ø±Û ÙØ¬Ø§Ø² ÙÛØ³ØªØ
+pass_nouser=رمزهای عبور حاوی نام کاربری را غیرفعال کنید؟
 pass_nodict=کلمه عبور کلمه لغت را مجاز نمی دانید؟
 pass_oldblock=تعداد کلمه عبورهای قدیمی برای رد کردن
 pass_nooldblock=محدودیتی برای استفاده مجدد از گذرواژه وجود ندارد
@@ -255,3 +261,20 @@ twofactor_failed=.. enrollment failed : $1
 twofactor_done=.. complete. Your ID with this provider is <tt>$1</tt>.
 twofactor_setup=Two-factor authentication has not been enabled on this system yet, but can be turned on using the <a href='$1'>Webmin Configuration</a> module.
 twofactor_ebutton=هیچ دکمه ای کلیک نشد!
+
+forgot_title=ارسال لینک بازیابی رمز عبور
+forgot_err=ارسال لینک بازیابی رمز عبور ناموفق بود
+forgot_header=جزئیات لینک بازنشانی رمز عبور
+forgot_user=بازنشانی رمز عبور برای کاربر
+forgot_email=روش تحویل لینک
+forgot_email_def=نمایش لینک در وب‌مین
+forgot_email_sel=ارسال لینک از طریق ایمیل به
+forgot_send=ارسال لینک
+forgot_desc=این صفحه به شما امکان می‌دهد لینکی ایجاد کنید یا آن را به هر آدرس ایمیلی ارسال کنید که می‌تواند برای انتخاب رمز عبور جدید برای کاربر وب‌مین استفاده شود. مراقب باشید که این لینک را به کدام آدرس ایمیل ارسال می‌کنید، زیرا عملاً دسترسی کامل به ورود به وب‌مین را اعطا می‌کند!
+forgot_adminmsg=شما این ایمیل را از مدیر سیستم وب‌مین در $3، برای ورود به سیستم $1 دریافت می‌کنید.\n\nاگر مایل به تنظیم مجدد رمز عبور هستید، این لینک را دنبال کنید:\n$2
+forgot_sending=ارسال ایمیل بازنشانی رمز عبور برای $2 تا $1 ..
+forgot_sent=.. ارسال شد
+forgot_link=از لینک زیر می‌توان برای تنظیم مجدد رمز عبور وب‌مین برای $1 در $2 دقیقه بعدی استفاده کرد :
+forgot_enosudo=سودو روی این سیستم در دسترس نیست!
+forgot_ecansudo=کاربر وارد شده مجوزهای sudo را ندارد
+forgot_eunix=کاربر وارد شده که قابلیت sudo دارد، وجود ندارد!
--- a/acl/lang/fi.auto
+++ b/acl/lang/fi.auto
@@ -36,6 +36,7 @@ edit_rights=Webmin-käyttäjän käyttöoikeudet
 edit_user=Käyttäjätunnus
 edit_cloneof=Kloonaa Webmin-käyttäjä
 edit_real=Oikea nimi
+edit_email=Yhteystiedot
 edit_group=Ryhmän jäsen
 edit_pass=Salasana
 edit_same=Sama kuin Unix
@@ -90,6 +91,7 @@ edit_selall=Valitse kaikki
 edit_invert=Käänteinen valinta
 edit_hide=Piilota käyttämätön
 edit_switch=Vaihda käyttäjälle
+edit_forgot=Lähetä salasanan palautuslinkki
 edit_return=Webmin-käyttäjä
 edit_return2=Webmin-ryhmä
 edit_rbacdeny=RBAC-käyttötila
@@ -148,6 +150,7 @@ save_edays=Ei valittuja päiviä
 save_ehours=Puuttuvat tai virheelliset ajat sallia
 save_ehours2=Aloitusajan on oltava ennen loppua
 save_etemp=Vaihtoehtoa pakottaa salasananvaihto seuraavan kirjautumisen yhteydessä ei voida käyttää, ellei <a href='$1'>kehoteta käyttäjiä syöttämään uusia salasanoja</a> on käytössä
+save_eemail=Sähköpostiosoite ei voi sisältää merkkiä :

 delete_err=Käyttäjän poistaminen epäonnistui
 delete_eself=Et voi poistaa itseäsi
@@ -247,6 +250,9 @@ log_sync=Vaihdettu unix-käyttäjän synkronointi
 log_sql=Muutettu käyttäjän ja ryhmän tietokanta
 log_twofactor=Rekisteröity käyttäjä $1 kaksikerroisen palveluntarjoajan kanssa $2
 log_onefactor=Rekisteröitynyt käyttäjä $1 kaksikerroiseen todennukseen
+log_forgot_send=Salasanan palautusviesti käyttäjälle $1 lähetetty käyttäjälle $2
+log_forgot_reset=Käyttäjän $1 salasanan vaihtaminen sähköpostiosoitteella $2
+log_forgot_admin=Ylläpitäjä lähetti salasanan palautusviestin käyttäjälle $1 käyttäjälle $2

 gedit_ecannot=Et voi muokata ryhmiä
 gedit_title=Muokkaa Webmin-ryhmää
@@ -509,3 +515,20 @@ twofactor_failed=.. ilmoittautuminen epäonnistui: $1
 twofactor_done=.. saattaa loppuun. Tunnuksesi tämän palveluntarjoajan kanssa on <tt>$1</tt>.
 twofactor_setup=Kaksifaktorista todennusta ei ole vielä otettu käyttöön tässä järjestelmässä, mutta se voidaan ottaa käyttöön <a href='$1'>Webmin-määritys</a> -moduulilla.
 twofactor_ebutton=Yhtään painiketta ei napsautettu!
+
+forgot_title=Lähetä salasanan palautuslinkki
+forgot_err=Salasanan palautuslinkin lähettäminen epäonnistui
+forgot_header=Salasanan palautuslinkin tiedot
+forgot_user=Käyttäjän salasanan vaihtaminen
+forgot_email=Linkin toimitustapa
+forgot_email_def=Näytä linkki Webminissä
+forgot_email_sel=Lähetä linkki sähköpostitse osoitteeseen
+forgot_send=Lähetä linkki
+forgot_desc=Tämän sivun avulla voit luoda tai lähettää linkin, jota voidaan käyttää uuden salasanan valitsemiseen Webmin-käyttäjälle mihin tahansa sähköpostiosoitteeseen. Ole varovainen, mihin osoitteeseen lähetät tämän linkin, sillä se antaa käytännössä täyden pääsyn Webmin-kirjautumiseen!
+forgot_adminmsg=Saat tämän sähköpostin Webmin-järjestelmän ylläpitäjältä osoitteessa $3, kirjautumistunnukselle $1.\n\nJos haluat jatkaa salasanan vaihtamista, seuraa tätä linkkiä:\n$2
+forgot_sending=Lähetetään salasanan palautusviesti osoitteelle $2 käyttäjälle $1 ..
+forgot_sent=.. lähetetty
+forgot_link=Alla olevaa linkkiä voidaan käyttää Webmin-salasanan nollaamiseen käyttäjälle $1 seuraavien $2 minuutin ajaksi :
+forgot_enosudo=Sudo ei ole käytettävissä tässä järjestelmässä!
+forgot_ecansudo=Annetulla käyttäjällä ei ole sudo-oikeuksia
+forgot_eunix=Annettua sudo-kykyistä käyttäjää ei ole olemassa!
--- a/acl/lang/fr.auto
+++ b/acl/lang/fr.auto
@@ -5,6 +5,7 @@ index_eulist=Échec de la liste des utilisateurs: $1
 index_eglist=Échec de la liste des groupes: $1

 edit_title3=Créer un utilisateur Webmin sécurisé
+edit_email=Courriel de contact
 edit_passold=Le dernier mot de passe a été modifié il y a $1 jours
 edit_passtoday=Le mot de passe a été modifié il y a moins d'un jour
 edit_twofactor=Type d'authentification à deux facteurs
@@ -15,6 +16,7 @@ edit_twofactoradd=Activer deux facteurs pour l'utilisateur
 edit_locale=Lieu
 edit_nochange=Appliquer les jours de changement de mot de passe?
 edit_overlay=Superposition de thème personnel
+edit_forgot=Envoyer le lien de réinitialisation du mot de passe
 edit_temppass=Forcer le changement à la prochaine connexion
 edit_security=Options de sécurité et de limites
 edit_proto=Type de stockage
@@ -28,6 +30,7 @@ save_eunixname=Le nom d'utilisateur '$1' n'est pas un utilisateur Unix et ne peu
 save_eoverlay=Une superposition de thème ne peut être sélectionnée que si un thème est
 save_eminsize=Longueur minimale du mot de passe manquante ou non numérique
 save_etemp=L'option pour forcer un changement de mot de passe à la prochaine connexion ne peut être utilisée que si <a href='$1'>invitant les utilisateurs à entrer de nouveaux mots de passe</a> est activée
+save_eemail=L'adresse e-mail ne peut pas contenir le caractère :

 delete_eanonuser=Cet utilisateur est utilisé pour l'accès au module anonyme

@@ -42,6 +45,9 @@ log_sync=Changement de la synchronisation des utilisateurs Unix
 log_sql=Base de données d'utilisateurs et de groupes modifiée
 log_twofactor=Utilisateur inscrit $1 avec un fournisseur à deux facteurs $2
 log_onefactor=Utilisateur désinscrit $1 pour l'authentification à deux facteurs
+log_forgot_send=Envoi d'un e-mail de réinitialisation du mot de passe pour l'utilisateur $1 à $2
+log_forgot_reset=Réinitialiser le mot de passe de l'utilisateur $1 avec l'e-mail $2
+log_forgot_admin=L'administrateur a envoyé un e-mail de réinitialisation du mot de passe pour l'utilisateur $1 à $2

 convert_sync2=Synchroniser le mot de passe avec l'utilisateur Unix à l'avenir?
 convert_user=Utilisateur Unix
@@ -147,3 +153,20 @@ twofactor_failed=.. l'inscription a échoué: $1
 twofactor_done=.. Achevée. Votre ID auprès de ce fournisseur est <tt>$1</tt>.
 twofactor_setup=L'authentification à deux facteurs n'a pas encore été activée sur ce système, mais peut être activée à l'aide du module <a href='$1'>Configuration Webmin</a>.
 twofactor_ebutton=Aucun bouton cliqué!
+
+forgot_title=Envoyer le lien de réinitialisation du mot de passe
+forgot_err=Échec de l'envoi du lien de réinitialisation du mot de passe
+forgot_header=Détails du lien de réinitialisation du mot de passe
+forgot_user=Réinitialiser le mot de passe de l'utilisateur
+forgot_email=Méthode de livraison du lien
+forgot_email_def=Afficher le lien dans Webmin
+forgot_email_sel=Envoyer le lien par e-mail à
+forgot_send=Envoyer le lien
+forgot_desc=Cette page vous permet de générer ou d'envoyer un lien permettant de choisir un nouveau mot de passe pour un utilisateur Webmin, à n'importe quelle adresse e-mail. Soyez vigilant quant à l'adresse à laquelle vous envoyez ce lien, car il vous accordera un accès complet à la connexion Webmin !
+forgot_adminmsg=Vous recevez cet e-mail de l'administrateur du système Webmin à $3, pour la connexion $1.\n\nSi vous souhaitez procéder à la réinitialisation du mot de passe, suivez ce lien :\n$2
+forgot_sending=Envoi d'un e-mail de réinitialisation du mot de passe pour $2 à $1 ..
+forgot_sent=.. envoyé
+forgot_link=Le lien ci-dessous peut être utilisé pour réinitialiser le mot de passe Webmin pour $1 pour les $2 prochaines minutes  :
+forgot_enosudo=Sudo n'est pas disponible sur ce système !
+forgot_ecansudo=L'utilisateur saisi n'a pas les autorisations sudo
+forgot_eunix=L'utilisateur compatible sudo saisi n'existe pas !
--- a/acl/lang/hr.auto
+++ b/acl/lang/hr.auto
@@ -6,6 +6,7 @@ index_eglist=Nije uspjelo popis grupa: $1

 edit_title3=Stvorite sigurnog korisnika Webmin-a
 edit_cloneof=Kloniranje korisnika Webmin-a
+edit_email=Kontaktna e-pošta
 edit_twofactor=Dvofaktorska vrsta autentifikacije
 edit_twofactorprov=Korištenje davatelja $1 s ID-om $2
 edit_twofactorcancel=Uklonite dvofaktorni zahtjev za provjeru autentičnosti
@@ -16,6 +17,7 @@ edit_nochange=Da li provodite dane za promjenu zaporke?
 edit_egone=Odabrani korisnik više ne postoji!
 edit_overlay=Prekrivanje osobne teme
 edit_overlayglobal=Nema - koristite zadane postavke teme
+edit_forgot=Pošalji poveznicu za resetiranje lozinke
 edit_global=Dozvole za sve module
 edit_temppass=Prisilite promjenu pri sljedećoj prijavi
 edit_proto=Vrsta skladištenja
@@ -31,6 +33,7 @@ edit_unsafe=Ponovno postavite na neograničeno
 save_eunixname=Korisničko ime '$1' nije Unix korisnik i zato ga nije moguće koristiti u sigurnom načinu rada
 save_eoverlay=Prekrivanje teme ne može se odabrati ako nije tema
 save_etemp=Opcija prisiljavanja promjene lozinke pri sljedećoj prijavi ne može se koristiti ako nije omogućen <a href='$1'>pozivanje korisnika da unose nove lozinke</a>
+save_eemail=Adresa e-pošte ne smije sadržavati znak :

 delete_eanonuser=Ovaj korisnik se koristi za anonimni pristup modulu

@@ -44,6 +47,9 @@ log_joingroup=Dodana $1 korisnici webminova u grupu $2
 log_sql=Izmijenjena korisnička i grupna baza podataka
 log_twofactor=Registrirani korisnik $1 s davateljem s dva faktora $2
 log_onefactor=Zabranjen korisnik $1 za dvofaktorsku provjeru autentičnosti
+log_forgot_send=Poslana je e-pošta za poništavanje lozinke za korisnika $1 na $2
+log_forgot_reset=Poništi lozinku za korisnika $1 s e-poštom $2
+log_forgot_admin=Administrator je poslao e-poruku za resetiranje lozinke za korisnika $1 na $2

 gedit_desc=Opis grupe
 gedit_egone=Odabrana skupina više ne postoji!
@@ -162,3 +168,20 @@ twofactor_failed=.. registracija nije uspjela: $1
 twofactor_done=.. kompletna. Vaš ID kod ovog davatelja usluga je <tt>$1</tt>.
 twofactor_setup=Dvofaktorna provjera identiteta još nije omogućena na ovom sustavu, ali se može uključiti pomoću modula <a href='$1'>Konfiguracija Webmin</a>.
 twofactor_ebutton=Nijedan gumb nije kliknut!
+
+forgot_title=Pošalji poveznicu za resetiranje lozinke
+forgot_err=Slanje poveznice za resetiranje lozinke nije uspjelo
+forgot_header=Detalji poveznice za resetiranje lozinke
+forgot_user=Poništi lozinku za korisnika
+forgot_email=Način isporuke poveznice
+forgot_email_def=Prikaži poveznicu u Webminu
+forgot_email_sel=Pošalji poveznicu putem e-pošte na
+forgot_send=Pošalji poveznicu
+forgot_desc=Ova stranica vam omogućuje generiranje ili slanje poveznice koja se može koristiti za odabir nove lozinke za Webmin korisnika na bilo koju adresu e-pošte. Budite oprezni na koju adresu šaljete ovu poveznicu jer će ona zapravo omogućiti puni pristup Webmin prijavi!
+forgot_adminmsg=Ovu e-poruku primate od administratora Webmin sustava na $3, za prijavu $1.\n\nAko želite nastaviti s resetiranjem lozinke, slijedite ovu poveznicu:\n$2
+forgot_sending=Slanje e-pošte za resetiranje lozinke za $2 na $1 ..
+forgot_sent=poslano
+forgot_link=Donja poveznica može se koristiti za resetiranje Webmin lozinke za $1 za sljedećih $2 minuta :
+forgot_enosudo=Sudo nije dostupan na ovom sustavu!
+forgot_ecansudo=Uneseni korisnik nema sudo dozvole
+forgot_eunix=Uneseni korisnik koji podržava sudo ne postoji!
--- a/acl/lang/hu.auto
+++ b/acl/lang/hu.auto
@@ -6,6 +6,7 @@ index_eglist=A csoportok felsorolása nem sikerült: $1

 edit_title3=Hozzon létre biztonságos Webmin felhasználót
 edit_cloneof=A Webmin felhasználó klónozása
+edit_email=Kapcsolatfelvételi e-mail cím
 edit_passlocked=A jelszó nem változott $1 napig - a fiók zárolva van!
 edit_passmax=A jelszó nem változott $1 napig - a következő bejelentkezéskor meg kell változtatni
 edit_passold=A jelszó utoljára megváltozott $1 nappal ezelőtt
@@ -22,6 +23,7 @@ edit_nochange=Végrehajtja a jelszócsere napjait?
 edit_egone=A kiválasztott felhasználó már nem létezik!
 edit_overlay=Személyes téma overlay
 edit_overlayglobal=Nincs - használja a téma alapértelmezéseit
+edit_forgot=Jelszó-visszaállítási link küldése
 edit_global=Minden modul engedélyei
 edit_temppass=A változtatás kényszerítése a következő bejelentkezéskor
 edit_days=A hét megengedett napjai
@@ -48,6 +50,7 @@ save_edays=Nincs nap kiválasztva
 save_ehours=Hiányzó vagy érvénytelen idő megengedhető
 save_ehours2=A megengedett kezdési időnek vége előtt kell lennie
 save_etemp=A jelszó megváltoztatásának kényszerítését a következő bejelentkezéskor csak akkor lehet használni, ha a <a href='$1'>felszólítja a felhasználókat új jelszavak megadására</a>.
+save_eemail=Az e-mail cím nem tartalmazhatja a : karaktert

 delete_eanonuser=Ezt a felhasználót anonim modul-hozzáféréshez használják

@@ -65,6 +68,9 @@ log_sync=Megváltozott az unix felhasználói szinkronizálás
 log_sql=Megváltozott felhasználói és csoport adatbázis
 log_twofactor=Regisztrált felhasználó $2
 log_onefactor=Nem regisztrált felhasználó $1 két tényezős hitelesítéshez
+log_forgot_send=Jelszó-visszaállító e-mail elküldve a(z) $1 felhasználó jelszavának visszaállítására vonatkozó e-mailben a következő címre: $2
+log_forgot_reset=Jelszó visszaállítása a(z) $1 felhasználóhoz, amelynek e-mail címe $2
+log_forgot_admin=Az adminisztrátor jelszó-visszaállító e-mailt küldött a(z) $1 felhasználónak a következő címre: $2

 gedit_desc=Csoport leírás
 gedit_egone=A kiválasztott csoport már nem létezik!
@@ -212,3 +218,20 @@ twofactor_failed=.. a regisztráció sikertelen: $1
 twofactor_done=.. teljes. Az Ön azonosítója ezzel a szolgáltatóval <tt>$1</tt>.
 twofactor_setup=A kétfaktoros hitelesítés még nem engedélyezve van ebben a rendszeren, de bekapcsolható a <a href='$1'>Webmin konfigurálása</a> modul segítségével.
 twofactor_ebutton=Nincs gombra kattintva!
+
+forgot_title=Jelszó-visszaállítási link küldése
+forgot_err=Nem sikerült elküldeni a jelszó-visszaállító linket
+forgot_header=Jelszó-visszaállítási link részletei
+forgot_user=Jelszó visszaállítása a felhasználóhoz
+forgot_email=Link kézbesítési módja
+forgot_email_def=Link megjelenítése a Webminben
+forgot_email_sel=Link küldése e-mailben ide:
+forgot_send=Link küldése
+forgot_desc=Ez az oldal lehetővé teszi egy link létrehozását vagy elküldését, amellyel új jelszót választhat egy Webmin felhasználó számára bármely e-mail címre. Ügyeljen arra, hogy melyik címre küldi ezt a linket, mivel az gyakorlatilag teljes hozzáférést biztosít a Webmin bejelentkezéshez!
+forgot_adminmsg=Ezt az e-mailt a(z) $3 címen található Webmin rendszer adminisztrátorától kapja a(z) $1 bejelentkezési névhez.\n\nHa folytatni szeretné a jelszó visszaállítását, kövesse ezt a linket:\n$2
+forgot_sending=Jelszó-visszaállító e-mail küldése a(z) $2 címhez $1 címre ..
+forgot_sent=.. elküldve
+forgot_link=Az alábbi linkre kattintva visszaállíthatja a(z) $1 Webmin jelszavát a következő $2 percre :
+forgot_enosudo=A Sudo nem érhető el ezen a rendszeren!
+forgot_ecansudo=A megadott felhasználónak nincsenek sudo jogosultságai
+forgot_eunix=A megadott sudo-képes felhasználó nem létezik!
--- a/acl/lang/it.auto
+++ b/acl/lang/it.auto
@@ -3,18 +3,21 @@ index_twofactor=Autenticazione a due fattori
 index_joingroup=Aggiungi al gruppo:

 edit_title3=Crea un utente Webmin sicuro
+edit_email=Email di contatto
 edit_twofactor=Tipo di autenticazione a due fattori
 edit_twofactorprov=Utilizzo del provider $1 con ID $2
 edit_twofactorcancel=Rimuovere i requisiti di autenticazione a due fattori
 edit_twofactornone=Nessuna configurazione ancora
 edit_twofactoradd=Abilita due fattori per l'utente
 edit_locale=Locale
+edit_forgot=Invia collegamento per reimpostare la password
 edit_safe=Livello di privilegio
 edit_safe0=illimitato
 edit_safe1=Solo moduli sicuri
 edit_unsafe=Ripristina su senza restrizioni

 save_eunixname=Il nome utente '$1' non è un utente Unix, quindi non può essere utilizzato in modalità provvisoria
+save_eemail=L'indirizzo email non può contenere il carattere :

 delete_eanonuser=Questo utente viene utilizzato per l'accesso al modulo anonimo

@@ -25,6 +28,9 @@ acl_locale=È possibile modificare le impostazioni locali?
 log_joingroup=Aggiunti $1 utenti Webmin al gruppo $2
 log_twofactor=Utente registrato $1 con provider a due fattori $2
 log_onefactor=Utente non registrato $1 per l'autenticazione a due fattori
+log_forgot_send=Inviata email di reimpostazione password per l'utente $1 a $2
+log_forgot_reset=Reimposta la password per l'utente $1 con e-mail $2
+log_forgot_admin=L'amministratore ha inviato un'e-mail per la reimpostazione della password per l'utente $1 a $2

 convert_sync2=Sincronizzare la password con l'utente Unix in futuro?
 convert_user=Utente Unix
@@ -75,3 +81,20 @@ twofactor_failed=.. registrazione non riuscita: $1
 twofactor_done=.. completare. Il tuo ID con questo provider è <tt>$1</tt>.
 twofactor_setup=L'autenticazione a due fattori non è stata ancora abilitata su questo sistema, ma può essere attivata utilizzando il modulo <a href='$1'>Configurazione Webmin</a>.
 twofactor_ebutton=Nessun pulsante cliccato!
+
+forgot_title=Invia collegamento per reimpostare la password
+forgot_err=Impossibile inviare il link per la reimpostazione della password
+forgot_header=Dettagli del collegamento per la reimpostazione della password
+forgot_user=Reimposta la password per l'utente
+forgot_email=Metodo di consegna del collegamento
+forgot_email_def=Visualizza collegamento in Webmin
+forgot_email_sel=Invia il collegamento via email a
+forgot_send=Invia collegamento
+forgot_desc=Questa pagina consente di generare o inviare a qualsiasi indirizzo email un link che può essere utilizzato per selezionare una nuova password per un utente Webmin. Fai attenzione all'indirizzo a cui invii questo link, poiché di fatto garantirà l'accesso completo al login di Webmin!
+forgot_adminmsg=Stai ricevendo questa e-mail dall'amministratore del sistema Webmin all'indirizzo $3, per l'accesso $1.\n\nSe desideri procedere con la reimpostazione della password, segui questo collegamento:\n$2
+forgot_sending=Invio dell'e-mail di reimpostazione della password per $2 a $1 ..
+forgot_sent=.. inviato
+forgot_link=Il collegamento sottostante può essere utilizzato per reimpostare la password Webmin per $1 per i prossimi $2 minuti :
+forgot_enosudo=Sudo non è disponibile su questo sistema!
+forgot_ecansudo=L'utente inserito non ha i permessi sudo
+forgot_eunix=L'utente abilitato a sudo immesso non esiste!
--- a/acl/lang/ja.auto
+++ b/acl/lang/ja.auto
@@ -5,6 +5,7 @@ index_eulist=ユーザーのリストに失敗しました： $1
 index_eglist=グループのリストに失敗しました： $1

 edit_title3=安全なWebminユーザーを作成する
+edit_email=連絡先メールアドレス
 edit_twofactor=二要素認証タイプ
 edit_twofactorprov=ID $2 のプロバイダー $1 を使用する
 edit_twofactorcancel=二要素認証要件を削除する
@@ -14,6 +15,7 @@ edit_locale=ロケール
 edit_egone=選択したユーザーは存在しません！
 edit_overlay=個人テーマのオーバーレイ
 edit_overlayglobal=なし-テーマのデフォルトを使用
+edit_forgot=パスワードリセットリンクを送信
 edit_global=すべてのモジュールの権限
 edit_proto=保管タイプ
 edit_proto_mysql=MySQLデータベース
@@ -28,6 +30,7 @@ edit_unsafe=無制限にリセット
 save_eunixname=ユーザー名「$1」はUnixユーザーではないため、セーフモードでは使用できません
 save_eoverlay=テーマオーバーレイを選択できないのは、テーマが
 save_etemp=<a href='$1'>ユーザーに新しいパスワードの入力を促す</a>が有効になっていない限り、次回ログイン時にパスワードの変更を強制するオプションは使用できません
+save_eemail=メールアドレスには「:」文字を含めることはできません

 delete_eanonuser=このユーザーは匿名モジュールアクセスに使用されています

@@ -41,6 +44,9 @@ log_joingroup=$1 Webminユーザーをグループ $2 に追加しました
 log_sql=変更されたユーザーおよびグループデータベース
 log_twofactor=登録済みユーザー $1 と2要素プロバイダー $2
 log_onefactor=二要素認証の登録解除ユーザー $1
+log_forgot_send=ユーザー $1 のパスワード リセット メールを $2 に送信しました
+log_forgot_reset=メール $2 を使用してユーザー $1 のパスワードをリセットします
+log_forgot_admin=管理者がユーザー $1 のパスワード リセット メールを $2 に送信しました

 gedit_desc=グループの説明
 gedit_egone=選択したグループはもう存在しません！
@@ -158,3 +164,20 @@ twofactor_failed=..登録に失敗しました： $1
 twofactor_done=..完了。このプロバイダーのIDは<tt>$1</tt>です。
 twofactor_setup=このシステムでは2要素認証はまだ有効になっていませんが、<a href='$1'>Webmin Configuration</a>モジュールを使用して有効にすることができます。
 twofactor_ebutton=ボタンがクリックされていません！
+
+forgot_title=パスワードリセットリンクを送信
+forgot_err=パスワードリセットリンクの送信に失敗しました
+forgot_header=パスワードリセットリンクの詳細
+forgot_user=ユーザーのパスワードをリセットする
+forgot_email=リンク配信方法
+forgot_email_def=Webminでリンクを表示する
+forgot_email_sel=リンクをメールで送信
+forgot_send=リンクを送信
+forgot_desc=このページでは、Webminユーザーの新しいパスワードを設定するためのリンクを生成または任意のメールアドレスに送信できます。このリンクを送信するアドレスにはご注意ください。送信先はWebminログインへのフルアクセスを許可することになりますのでご注意ください。
+forgot_adminmsg=このメールは、$3 の Webmin システムの管理者から、ログイン $1 に対して送信されました。\n\nパスワードのリセットを続行する場合は、次のリンクをクリックしてください :\n$2
+forgot_sending=$2 のパスワード リセット メールを $1 に送信しています。
+forgot_sent=.. 送信済み
+forgot_link=以下のリンクを使用すると、今後 $2 分間、$1 の Webmin パスワードをリセットできます。
+forgot_enosudo=このシステムでは Sudo は使用できません。
+forgot_ecansudo=入力されたユーザーにはsudo権限がありません
+forgot_eunix=入力された sudo 対応ユーザーは存在しません。
--- a/acl/lang/ko.auto
+++ b/acl/lang/ko.auto
@@ -5,6 +5,7 @@ index_eulist=사용자를 나열하지 못했습니다 : $1
 index_eglist=그룹을 나열하지 못했습니다 : $1

 edit_title3=안전한 Webmin 사용자 생성
+edit_email=연락처 이메일
 edit_twofactor=이중 인증 유형
 edit_twofactorprov=ID가 $2 인 제공자 $1 사용
 edit_twofactorcancel=이중 인증 요구 사항 제거
@@ -14,6 +15,7 @@ edit_locale=장소
 edit_egone=선택된 사용자가 더 이상 존재하지 않습니다!
 edit_overlay=개인 테마 오버레이
 edit_overlayglobal=없음-테마 기본값 사용
+edit_forgot=비밀번호 재설정 링크 보내기
 edit_global=모든 모듈에 대한 권한
 edit_proto=저장 유형
 edit_proto_mysql=MySQL 데이터베이스
@@ -28,6 +30,7 @@ edit_unsafe=무제한으로 재설정
 save_eunixname=사용자 이름 '$1'은 (는) Unix 사용자가 아니므로 안전 모드에서 사용할 수 없습니다
 save_eoverlay=테마가 아닌 경우 테마 오버레이를 선택할 수 없습니다
 save_etemp=<a href='$1'>사용자에게 새 비밀번호를 입력하도록 프롬프트</a>하지 않으면 다음 로그인시 비밀번호를 강제로 변경하는 옵션을 사용할 수 없습니다.
+save_eemail=이메일 주소에는 : 문자를 포함할 수 없습니다

 delete_eanonuser=이 사용자는 익명 모듈 액세스에 사용되고 있습니다

@@ -41,6 +44,9 @@ log_joingroup=$1 Webmin 사용자를 $2 그룹에 추가했습니다.
 log_sql=변경된 사용자 및 그룹 데이터베이스
 log_twofactor=2 단계 공급자 $2 에 등록 된 사용자 $1
 log_onefactor=이중 인증을위한 등록 해제 된 사용자 $1
+log_forgot_send=사용자 $1의 비밀번호 재설정 이메일을 $2에게 보냈습니다
+log_forgot_reset=이메일 주소 $2를 사용하여 사용자 $1의 비밀번호를 재설정합니다
+log_forgot_admin=관리자가 사용자 $1에 대한 비밀번호 재설정 이메일을 $2에게 보냈습니다

 gedit_desc=그룹 설명
 gedit_egone=선택된 그룹이 더 이상 존재하지 않습니다!
@@ -158,3 +164,20 @@ twofactor_failed=.. 등록 실패 : $1
 twofactor_done=.. 완료 이 제공자의 귀하의 ID는 <tt>$1</tt>입니다.
 twofactor_setup=이 시스템에서 2 단계 인증이 아직 활성화되지 않았지만 <a href='$1'>Webmin 구성</a> 모듈을 사용하여 켤 수 있습니다.
 twofactor_ebutton=버튼을 클릭하지 않았습니다!
+
+forgot_title=비밀번호 재설정 링크 보내기
+forgot_err=비밀번호 재설정 링크를 보내지 못했습니다
+forgot_header=비밀번호 재설정 링크 세부 정보
+forgot_user=사용자 비밀번호 재설정
+forgot_email=링크 전달 방식
+forgot_email_def=Webmin에서 링크 표시
+forgot_email_sel=이메일로 링크 보내기
+forgot_send=링크 보내기
+forgot_desc=이 페이지에서는 Webmin 사용자의 새 비밀번호를 선택하는 데 사용할 수 있는 링크를 생성하거나 모든 이메일 주소로 전송할 수 있습니다. 이 링크를 어떤 이메일 주소로 보낼지 신중하게 선택해야 합니다. Webmin 로그인에 대한 모든 권한이 부여되기 때문입니다!
+forgot_adminmsg=$3의 Webmin 시스템 관리자로부터 $1 로그인에 대한 이메일을 받았습니다.\n\n비밀번호 재설정을 진행하려면 이 링크를 따르세요:\n$2
+forgot_sending=$2에 대한 비밀번호 재설정 이메일을 $1(으)로 보내는 중 ..
+forgot_sent=.. 전송된
+forgot_link=아래 링크를 사용하면 $1의 Webmin 비밀번호를 다음 $2분 동안 재설정할 수 있습니다
+forgot_enosudo=이 시스템에서는 sudo를 사용할 수 없습니다!
+forgot_ecansudo=입력된 사용자에게 sudo 권한이 없습니다
+forgot_eunix=sudo 권한이 있는 사용자가 존재하지 않습니다!
--- a/acl/lang/ms.auto
+++ b/acl/lang/ms.auto
@@ -1,18 +1,25 @@
 index_screate=Buat pengguna selamat yang baru.

 edit_title3=Buat Pengguna Webmin Selamat
+edit_email=E-mel hubungan
 edit_locale=Tempatan
+edit_forgot=Hantar Pautan Tetapan Semula Kata Laluan
 edit_safe=Tahap keistimewaan
 edit_safe0=Tidak terkawal
 edit_safe1=Modul selamat sahaja
 edit_unsafe=Tetapkan semula kepada tanpa had

 save_eunixname=Nama pengguna '$1' bukan pengguna Unix, dan oleh itu tidak boleh digunakan dalam mod selamat
+save_eemail=Alamat e-mel tidak boleh mengandungi : aksara

 delete_eanonuser=Pengguna ini sedang digunakan untuk akses modul tanpa nama

 acl_locale=Boleh tukar tempat?

+log_forgot_send=Menghantar e-mel tetapan semula kata laluan untuk pengguna $1 hingga $2 
+log_forgot_reset=Tetapkan semula kata laluan untuk pengguna $1 dengan e-mel $2 
+log_forgot_admin=Pentadbir menghantar e-mel tetapan semula kata laluan untuk pengguna $1 hingga $2 
+
 sync_modify=Ganti nama pengguna Webmin yang sepadan apabila pengguna Unix dinamakan semula.

 sessions_actions=Tindakan..
@@ -37,3 +44,20 @@ sql_timeout_secs=saat
 sql_etimeout=Tamat masa sambungan cache mestilah nombor

 twofactor_ebutton=Tiada butang diklik!
+
+forgot_title=Hantar Pautan Tetapan Semula Kata Laluan
+forgot_err=Gagal menghantar pautan tetapan semula kata laluan
+forgot_header=Butiran pautan tetapan semula kata laluan
+forgot_user=Tetapkan semula kata laluan untuk pengguna
+forgot_email=Kaedah penghantaran pautan
+forgot_email_def=Paparkan pautan dalam Webmin
+forgot_email_sel=Hantar pautan melalui e-mel ke
+forgot_send=Hantar Pautan
+forgot_desc=Halaman ini membolehkan anda menjana atau menghantar pautan yang boleh digunakan untuk memilih kata laluan baharu untuk pengguna Webmin ke mana-mana alamat e-mel. Berhati-hati ke alamat mana anda menghantar pautan ini, kerana ia akan memberikan akses penuh kepada log masuk Webmin dengan berkesan!
+forgot_adminmsg=Anda menerima e-mel ini daripada pentadbir sistem Webmin di $3, untuk log masuk $1.\n\nJika anda ingin meneruskan penetapan semula kata laluan, ikuti pautan ini :\n$2
+forgot_sending=Menghantar e-mel tetapan semula kata laluan untuk $2 hingga $1 ..
+forgot_sent=.. dihantar
+forgot_link=Pautan di bawah boleh digunakan untuk menetapkan semula kata laluan Webmin untuk $1 untuk $2 minit seterusnya  :
+forgot_enosudo=Sudo tidak tersedia pada sistem ini!
+forgot_ecansudo=Pengguna yang dimasukkan tidak mempunyai kebenaran sudo
+forgot_eunix=Pengguna berkemampuan sudo yang dimasukkan tidak wujud!
--- a/acl/lang/nl.auto
+++ b/acl/lang/nl.auto
@@ -3,18 +3,21 @@ index_twofactor=Twee-factor authenticatie
 index_joingroup=Aan groep toevoegen:

 edit_title3=Maak een veilige webmingebruiker aan
+edit_email=Contact e-mailadres
 edit_twofactor=Twee-factor authenticatietype
 edit_twofactorprov=Gebruik provider $1 met ID $2
 edit_twofactorcancel=Verwijder twee-factor authenticatie vereiste
 edit_twofactornone=Nog geen configuratie
 edit_twofactoradd=Twee-factor voor gebruiker inschakelen
 edit_locale=Lokaal
+edit_forgot=Stuur wachtwoordherstellink
 edit_safe=Privilege niveau
 edit_safe0=onbeperkt
 edit_safe1=Alleen veilige modules
 edit_unsafe=Reset naar onbeperkt

 save_eunixname=De gebruikersnaam '$1' is geen Unix-gebruiker en kan dus niet in de veilige modus worden gebruikt
+save_eemail=E-mailadres mag het teken : niet bevatten

 delete_eanonuser=Deze gebruiker wordt gebruikt voor anonieme moduletoegang

@@ -25,6 +28,9 @@ acl_locale=Kan de locatie worden gewijzigd?
 log_joingroup=$1 Webmin-gebruikers toegevoegd aan $2
 log_twofactor=Ingeschreven gebruiker $1 bij two-factor provider $2
 log_onefactor=Uitgeschreven gebruiker $1 voor tweefactorauthenticatie
+log_forgot_send=Verzonden e-mail voor wachtwoordherstel voor gebruiker $1 naar $2
+log_forgot_reset=Wachtwoord opnieuw instellen voor gebruiker $1 met e-mailadres $2
+log_forgot_admin=Beheerder heeft wachtwoordherstel-e-mail verzonden voor gebruiker $1 naar $2

 convert_sync2=Wachtwoord synchroniseren met Unix-gebruiker in de toekomst?
 convert_user=Unix-gebruiker
@@ -74,3 +80,20 @@ twofactor_failed=.. inschrijving mislukt: $1
 twofactor_done=.. compleet. Uw ID bij deze provider is <tt>$1</tt>.
 twofactor_setup=Tweefactorauthenticatie is nog niet ingeschakeld op dit systeem, maar kan worden ingeschakeld met de module <a href='$1'>Webmin-configuratie</a>.
 twofactor_ebutton=Er is niet op een knop geklikt!
+
+forgot_title=Stuur wachtwoordherstellink
+forgot_err=Het is niet gelukt om de link voor het opnieuw instellen van het wachtwoord te versturen
+forgot_header=Details voor wachtwoordherstellink
+forgot_user=Wachtwoord voor gebruiker opnieuw instellen
+forgot_email=Linkleveringsmethode
+forgot_email_def=Link weergeven in Webmin
+forgot_email_sel=Link via e-mail verzenden naar
+forgot_send=Link verzenden
+forgot_desc=Met deze pagina kunt u een link genereren of versturen naar elk e-mailadres waarmee u een nieuw wachtwoord voor een Webmin-gebruiker kunt kiezen. Let op naar welk adres u deze link stuurt, want hiermee krijgt u in feite volledige toegang tot de Webmin-login!
+forgot_adminmsg=U ontvangt deze e-mail van de beheerder van het Webmin-systeem op $3, voor de login $1.\n\nAls u wilt doorgaan met het opnieuw instellen van het wachtwoord, volgt u deze link:\n$2
+forgot_sending=Verzenden van e-mail voor wachtwoordherstel van $2 naar $1 ..
+forgot_sent=.. verstuurd
+forgot_link=U kunt de onderstaande link gebruiken om het Webmin-wachtwoord voor $1 opnieuw in te stellen voor de komende $2 minuten :
+forgot_enosudo=Sudo is niet beschikbaar op dit systeem!
+forgot_ecansudo=De ingevoerde gebruiker heeft geen sudo-rechten
+forgot_eunix=De ingevoerde sudo-compatibele gebruiker bestaat niet!
--- a/acl/lang/no
+++ b/acl/lang/no
@@ -1,9 +1,9 @@
 index_title=Webmin Brukere
 index_user=Brukere
 index_modules=Moduler
-index_create=Opprett ny Webmin bruker
+index_create=Opprett ny Webmin-bruker
 index_screate=Opprett ny sikker bruker
-index_convert=Konverter Unix til Webmin brukere
+index_convert=Konverter Unix til Webmin-brukere
 index_cert=Krever SSL sertifikat
 index_twofactor=To-faktor autentisering
 index_certmsg=Klikk på denne knappen for å spørre etter et SSL sertifikat som vil gi deg sikker login i Webmin uten å måtte skrive brukernavn og passord.
@@ -14,7 +14,7 @@ index_global=Global ACL
 index_users=Webmin Brukere
 index_groups=Webmin Grupper
 index_group=Gruppe
-index_nousers=Ingen editerbar Webmin bruker er definert.
+index_nousers=Ingen editerbar Webmin-bruker er definert.
 index_nogroups=Ingen editerbar Webmin gruppe er definert.
 index_gcreate=Lag en ny Webmin gruppe
 index_members=Medlemmer
@@ -30,11 +30,11 @@ index_eglist=Kunne ikke liste grupper : $1

 edit_title=Rediger Webmin Bruker
 edit_title2=Lag Webmin Bruker
-edit_title3=Opprett sikker Webmin bruker
-edit_readonly=Denne Webmin brukeren bør ikke redigeres siden den vedlikeholdes av modulen $1. <a href='$2'>Klikk her</a> for å ignorere denne advarselen og redigere brukeren allikevel - men vær oppmerksom på at manuelle endringer kan bli overskrevet!
-edit_rights=Tilgangsrettigheter for Webmin bruker
+edit_title3=Opprett sikker Webmin-bruker
+edit_readonly=Denne Webmin-brukeren bør ikke redigeres siden den vedlikeholdes av modulen $1. <a href='$2'>Klikk her</a> for å ignorere denne advarselen og redigere brukeren allikevel - men vær oppmerksom på at manuelle endringer kan bli overskrevet!
+edit_rights=Tilgangsrettigheter for Webmin-bruker
 edit_user=Brukernavn
-edit_cloneof=Klober Webmin bruker
+edit_cloneof=Klober Webmin-bruker
 edit_real=Virkelig navn
 edit_group=Medlem av gruppe
 edit_pass=Passord
@@ -89,7 +89,7 @@ edit_selall=Velg alle
 edit_invert=Inverter valg
 edit_hide=Skjul ubrukte
 edit_switch=Bytt til bruker
-edit_return=Webmin bruker
+edit_return=Webmin-bruker
 edit_return2=Webmin gruppe
 edit_rbacdeny=RBAC tilgangsmodus
 edit_rbacdeny0=RBAC kontrollerer valgte modul ACLer
@@ -126,21 +126,21 @@ save_eoverlay=Et tema-overlegg kan ikke velges med mindre et tema er
 save_edeny=Du kan ikke nekte deg selv tilgang til Webmin Bruker modulen
 save_eos=Det samme som Unix passord opsjonen er ikke støttet på ditt operativsystem.
 save_emd5=Det samme som Unix passord opsjonen kan ikke brukes på systemer med MD5 kryptering
-save_eunix=Unix bruker '$1' eksisterer ikke
+save_eunix=Unix-brukeren '$1' eksisterer ikke
 save_emod=Du kan ikke bevilge tilgang til modul '$1'
 save_ecreate=Du har ikke tilgang til å opprette brukere
-save_euser=Du har ikke tilgang til å editere denne brukeren
+save_euser=Du har ikke tilgang til å redigere denne brukeren
 save_ecolon=Passord kan ikke inneholde : karakteren
 save_epass=Passord er ikke gyldig : $1
-save_eself=Din vanlige IP adresse ($1) vil bli nektet
+save_eself=Din vanlige IP-adresse ($1) vil bli nektet
 save_epam=PAM autentisering er ikke tilgjengelig fordi <tt>Authen::PAM</tt> Perl modulen ikke er installert eller ikke virker ordentlig.
 save_epam2=Du kan bruke Webmin's Perl Modules modul til <a href='$1'>laste ned å installere Authen::PAM</a> nå.
 save_egroup=Du har ikke rettigheter til å tildele til den gruppen
 save_enone=Ingen adresse er tastet inn
-save_enet='$1' er ikke en gyldig nettverks adresse
+save_enet='$1' er ikke en gyldig nettverksadresse
 save_emask='$1' er ikke en gyldig nettmaske
-save_eip='$1' er ikke en komplett IP eller nettverks adresse
-save_ehost=Kunne ikke finne IP adresse for '$1'
+save_eip='$1' er ikke en komplett IP eller nettverksadresse
+save_ehost=Kunne ikke finne IP-adresse for '$1'
 save_elogouttime=Manglende eller ikke-numerisk tid for utlogging ved inaktivitet
 save_eminsize=Manglende eller ikke-numerisk minimum passordlengde
 save_edays=Ingen tillatte dager valgt
@@ -223,11 +223,11 @@ acl_times=Kan endre tillatte innloggings-tider?
 acl_pass=Kan endre passord-begrensinger?
 acl_sql=Kan konfigurere databasen for brukere og grupper?

-log_modify=Modifisert Webmin bruker $1
-log_rename=Skiftet navn på Webmin bruker $1 til $2
-log_create=Opprettet Webmin bruker $1
-log_clone=Klonet Webmin bruker $1 til $2
-log_delete=Slettet Webmin bruker $1
+log_modify=Modifisert Webmin-bruker $1
+log_rename=Skiftet navn på Webmin-bruker $1 til $2
+log_create=Opprettet Webmin-bruker $1
+log_clone=Klonet Webmin-bruker $1 til $2
+log_delete=Slettet Webmin-bruker $1
 log_acl=Oppdatert tilgang for $1 i $2
 log_reset=Tilbakestilte tilgang for $1 i $2
 log_cert=Utlevert sertifikat for bruker $1
@@ -235,10 +235,10 @@ log_modify_g=Modifisert Webmin gruppe $1
 log_rename_g=Forandret navn på Webmin gruppe $1 til $2
 log_create_g=Opprettet Webmin gruppe $1
 log_delete_g=Slettet Webmin gruppe $1
-log_switch=Byttet til Webmin bruker $1
-log_delete_users=Slettet $1 Webmin brukere
+log_switch=Byttet til Webmin-bruker $1
+log_delete_users=Slettet $1 Webmin-brukere
 log_delete_groups=Slettet $1 Webmin grupper
-log_joingroup=La til $1 Webmin brukere i gruppe $2
+log_joingroup=La til $1 Webmin-brukere i gruppe $2
 log_pass=Endret passord-begrensinger
 log_unix=Endret unix bruker-autentisering
 log_sync=Endret unix bruker-synkronisering
@@ -273,7 +273,7 @@ gsave_edesc=Ugyldig beskrivelse - tegnet : er ikke tillatt
 convert_title=Konverter Brukere
 convert_ecannot=Du har ikke tilgang til å konvertere Unix brukere
 convert_nogroups=Ingen Webmin gruppe er definert på ditt system. Du må i det minste lage en gruppe før du konverterer brukere, dette for å kunne sette rettigheter for konverterte brukere.
-convert_desc=Denne Dette feltet lar deg konvertere eksisterende Unix brukere til Webmin brukere. Rettighetene til hver nye Webmin bruker vil bestemmes av rettighetene til gruppen som valgt over.
+convert_desc=Denne Dette feltet lar deg konvertere eksisterende Unix-brukere til Webmin-brukere. Rettighetene til hver nye Webmin-bruker vil bestemmes av rettighetene til gruppen som valgt over.
 convert_0=Alle brukere
 convert_1=Bare brukere
 convert_2=Alle unntagen brukere
@@ -284,43 +284,43 @@ convert_sync2=Synk. passord med Unix-bruker i fremtiden?
 convert_ok=Konverter nå
 convert_err=Kunne ikke konvertere brukere
 convert_eusers=Ingen brukere inntastet
-convert_egroup=Unix gruppe eksisterer ikke
-convert_emin=Ugyldig minimum bruker ID (UID)
-convert_emax=Ugyldig maksimum bruker ID (UID)
+convert_egroup=Unix-gruppen eksisterer ikke
+convert_emin=Ugyldig minimum bruker-ID (UID)
+convert_emax=Ugyldig maksimum bruker-ID (UID)
 convert_ewgroup=Ingen sånn Webmin gruppe
 convert_ewgroup2=Du har ikke rettigheter til å tilordne nye brukere til denne gruppen
 convert_skip=Hoppet over $1
 convert_exists=$1 Eksisterer allerede
-convert_invalid=$1 er ikke et gyldig Webmin brukernavn
+convert_invalid=$1 er ikke et gyldig Webmin-brukernavn
 convert_added=$1 er lagt til
-convert_msg=Konverterer Unix brukere...
+convert_msg=Konverterer Unix-brukere...
 convert_user=Unix-bruker
-convert_action=Handling utfÃ¸rt
+convert_action=Handling utført
 convert_done=$1 brukere konvertert, $2 ugyldig, $3 finnes allerede, $4 ekskludert.
 convert_users=Brukere som skal konverteres

-sync_title=Unix Bruker Synkronisering
-sync_desc=Dette feltet lar deg konfigurere automatisk synkronisering av Unix brukere laget via Webmin og brukere i denne modulen.
+sync_title=Unix-brukersynkronisering
+sync_desc=Dette feltet lar deg konfigurere automatisk synkronisering av Unix-brukere laget via Webmin og brukere i denne modulen.
 sync_nogroups=Ingen Webmin gruppe er definert på ditt system. Du må i det minste lage en gruppe før du konverterer brukere, dette for å kunne sette rettigheter for konverterte brukere.
 sync_when=Synkroniser nÃ¥r
-sync_create=Opprett Webmin bruker når en Unix bruker blir laget.
-sync_update=Oppdater passende Webmin bruker når Unix brukere blir oppdatert.
-sync_delete=Slett passende Webmin bruker når Unix brukere blir slettet.
+sync_create=Opprett Webmin-bruker når en Unix bruker blir laget.
+sync_update=Oppdater passende Webmin-bruker når Unix-brukere blir oppdatert.
+sync_delete=Slett passende Webmin-bruker når Unix-brukere blir slettet.
 sync_group=Tilordne ny bruker til Webmin gruppe
 sync_unix=Sett passord for nye brukere til Unix autentisering
 sync_ecannot=Du har ikke rettigheter til å konfigurere bruker synkronisering.

-unix_title=Unix Bruker Autentisering
+unix_title=Unix-brukerautentisering
 unix_err=Kunne ikke lagre Unix autentisering
-unix_desc=Denne siden lar deg konfigurere Webmin til verifisere login forsøk med systemets bruker liste og PAM. Dette kan være nyttig hvis du har mange eksisterende Unix brukere som du ønsker å gi tilgang til Webmin.
-unix_def=Tillat bare login av Webmin brukere
-unix_sel=Tillat Unix brukere i listen nedenfor å logge inn ..
+unix_desc=Denne siden lar deg konfigurere Webmin til verifisere login forsøk med systemets bruker liste og PAM. Dette kan være nyttig hvis du har mange eksisterende Unix-brukere som du ønsker å gi tilgang til Webmin.
+unix_def=Tillat bare login av Webmin-brukere
+unix_sel=Tillat Unix-brukere i listen nedenfor å logge inn ..
 unix_mode=Tillat
 unix_mall=Alle brukere
 unix_group=Medlemmer i gruppen..
-unix_user=Tillat alle Unix brukere login med rettigheter som Users
+unix_user=Tillat alle Unix-brukere login med rettigheter som Users
 unix_who=Bruker eller gruppe
-unix_to=Som Webmin bruker
+unix_to=Som Webmin-bruker
 unix_ecannot=Du har ikke rettigheter til å konfigurere Unix bruker autentisering
 unix_epam=Unix autentisering er ikke tilgjengelig fordi <tt>Authen::PAM</tt> Perl modul ikke er installert eller ikke virker som den skal.
 unix_all=Tillat alle Unix brukere
@@ -329,12 +329,12 @@ unix_deny=Nekt listede Unix brukere
 unix_none=Ingen brukere angitt
 unix_euser='$1' er ikke et gyldig brukernavn
 unix_egroup='$1' er ikke et gyldig gruppenavn
-unix_shells=Nekt Unix brukere hvis skall ikke finnes i filen
+unix_shells=Nekt Unix-brukere hvis skall ikke finnes i filen
 unix_eshells=Manglende eller ikke-eksisterende shells fil
 unix_restrict2=Ekstra restriksjoner
 unix_ewhogroup=Manglende tillatt gruppe i rad $1
 unix_ewhouser=Manglende tilllatt bruker i rad $1
-unix_enone=Ingen tillatte Unix brukere og grupper ble angitt
+unix_enone=Ingen tillatte Unix-brukere og grupper ble angitt
 unix_same=&lt;Samme bruker eller gruppe&gt;
 unix_sudo=TIllatt brukere som kan kjøre alle kommandoer via <tt>sudo</tt> å logge inn som <tt>root</tt>
 unix_pamany=Behandle brukere som bare sender PAM validering som $1
@@ -345,9 +345,9 @@ unix_utable=Tillatte Unix brukere

 sessions_title=Aktuell Login Session
 sessions_id=Sessions ID
-sessions_user=Webmin bruker
+sessions_user=Webmin-bruker
 sessions_login=Innlogget
-sessions_host=IP adresse
+sessions_host=IP-adresse
 sessions_lview=Se logger..
 sessions_actions=Handlinger..
 sessions_logouts=Vis også utloggede sesjoner..
@@ -357,7 +357,7 @@ sessions_in=Innlogget
 sessions_out=Logget ut
 sessions_kill=Koble fra..

-logins_title=Siste Webmin innlogginger
+logins_title=Siste Webmin-innlogginger

 hide_title=Skjul ubrukte moduler
 hide_desc=Følgende moduler vil bli fjernet fra modul tilgangslisten for $1 siden deres tilhørende tjenere ikke er installert på systemet ditt ..
@@ -374,7 +374,7 @@ rbac_desc=Webmin's RBAC integration provides a way for user module and ACL permi
 rbac_esolaris=RBAC støttes bare på Solaris systemer for øyeblikket, og kan derfor ikke brukes på dette $1 systemet.
 rbac_eperl=Perl-modulen $1, som behøves for RBAC integrasjon, er ikke installert. <a href='$2'>Klikk her</a> for å installere den nå.
 rbac_ecpan=Du har ikke tilgang til Webmins Perl Moduler side for å kunne installere den nødvendige $1 modulen for RBAC integrasjon.
-rbac_ok=RBAC integrasjon er tilgjengelig for dette systemet, og kan aktiveres per bruker på siden Rediger Webmin bruker.
+rbac_ok=RBAC integrasjon er tilgjengelig for dette systemet, og kan aktiveres per bruker på siden Rediger Webmin-bruker.

 udeletes_err=Kunne ikke slette brukere
 udeletes_jerr=Kunne ikke legg til brukere i gruppe
@@ -391,7 +391,7 @@ gdeletes_rusure=Er du sikker på at du ønsker å slette de $1 valgte gruppene o
 gdeletes_users=Valgte grupper: $1
 gdeletes_ok=Slett grupper

-pass_title=Passord begrensinger
+pass_title=Passordbegrensinger
 pass_ecannot=Du har ikke lov til å redigere passord-begrensinger
 pass_header=Innstillinger for Webmin passord begrensinger
 pass_minsize=Minimum passordlengde
@@ -424,7 +424,7 @@ cpass_old=Gamle passord kan ikke brukes på nytt

 sql_title=Bruker- og gruppe-database
 sql_ecannot=Du har ikke lov til å konfigurere bruker- og gruppedatabasen
-sql_header=Instillinger for database backend for brukere og grupper
+sql_header=Innstillinger for database backend for brukere og grupper
 sql_host=Vertsnavn
 sql_user=Brukernavn
 sql_pass=Passord
@@ -456,7 +456,7 @@ sql_edb=Ugyldig databasenavn (mellomrom ikke tillatt)
 sql_eprefix=Manglende eller ugyldig base DN (mellomrom ikke tillatt)
 sql_eprefix2=Ugyldig-utseende base DN - skal være på formen <tt>dc=mittdomene,dc=no</tt>
 sql_title2=Opprett manglende tabeller
-sql_tableerr=Instillinger for bruker- og gruppedatabase er gyldig, men noen tabeller som Webmin trenger, mangler : $1
+sql_tableerr=Innstillinger for bruker- og gruppedatabase er gyldig, men noen tabeller som Webmin trenger, mangler : $1
 sql_tableerr2=Klikk på knappen <b>Opprett tabeller</b> nedenfor, for å få opprettet dem automatisk, eller du kan kjøre SQL uttrykket nedenfor manuelt.
 sql_make=Opprett tabeller
 sql_title3=Opprett manglende DN
@@ -489,7 +489,7 @@ twofactor_title=To-faktor autentisering
 twofactor_disable=Deaktiver to-faktor autentisering
 twofactor_already=Din Webmin-bruker har allerede to-faktor autentisering aktivert med leverandør %1 og konto ID %2.
 twofactor_already2=Webmin-brukeren %3 har allerede to-faktor autentisering aktivert med leverandør %1 og konto ID %2.
-twofactor_desc=Denne siden lar deg aktivere to-faktor autentisering for din Webmin bruker vha. <a href='$2' target=_blank>$1</a>. Når denne er aktivert kreves det et ekstra autentiserings-token når du logger inn på Webmin.
+twofactor_desc=Denne siden lar deg aktivere to-faktor autentisering for din Webmin-bruker vha. <a href='$2' target=_blank>$1</a>. Når denne er aktivert kreves det et ekstra autentiserings-token når du logger inn på Webmin.
 twofactor_desc2=Denne siden lar deg aktivere to-faktor autentisering for Webmin-brukeren $1 vha. <a href='$2' target=_blank>$1</a>. Når denne er aktivert vil det kreves et ekstra autentiserings-token for å logge inn på Webmin.
 twofactor_enable=Meld inn til to-faktor autentisering
 twofactor_header=Detaljer for innmelding til to-faktor autentisering
--- a/acl/lang/no.auto
+++ b/acl/lang/no.auto
@@ -1,7 +1,15 @@
+edit_email=Kontakt-e-postadresse
 edit_locale=Språk
+edit_forgot=Send lenke til tilbakestilling av passord
+
+save_eemail=E-postadressen kan ikke inneholde tegnet:

 acl_locale=Kan du endre lokalitet?

+log_forgot_send=Sendte e-post for tilbakestilling av passord for bruker $1 til $2
+log_forgot_reset=Tilbakestill passord for bruker $1 med e-postadressen $2
+log_forgot_admin=Admin sendte e-post om tilbakestilling av passord for bruker $1 til $2
+
 sync_modify=Gi nytt navn til den samsvarende Webmin-brukeren når en Unix-bruker får nytt navn.

 sessions_all=Alle økter..
@@ -13,3 +21,20 @@ sql_timeout_def=Bruk standard tilkoblingstimeout (60 sekunder)
 sql_timeout_for=Lukk hurtigbufrede tilkoblinger etter
 sql_timeout_secs=sekunder
 sql_etimeout=Tidsavbrudd for hurtigbufret tilkobling må være et tall
+
+forgot_title=Send lenke til tilbakestilling av passord
+forgot_err=Kunne ikke sende lenken for tilbakestilling av passord
+forgot_header=Detaljer om lenke til tilbakestilling av passord
+forgot_user=Tilbakestill passord for bruker
+forgot_email=Leveringsmetode for lenker
+forgot_email_def=Vis lenke i Webmin
+forgot_email_sel=Send lenke via e-post til
+forgot_send=Send lenke
+forgot_desc=Denne siden lar deg generere eller sende en lenke som kan brukes til å velge et nytt passord for en Webmin-bruker til en hvilken som helst e-postadresse. Vær forsiktig med hvilken adresse du sender denne lenken til, da den effektivt vil gi full tilgang til Webmin-påloggingen!
+forgot_adminmsg=Du mottar denne e-posten fra administratoren av Webmin-systemet på $3, for påloggingen $1.\n\nHvis du vil fortsette med å tilbakestille passordet, følg denne lenken:\n$2
+forgot_sending=Sender e-post for tilbakestilling av passord for $2 til $1 ..
+forgot_sent=.. sendt
+forgot_link=Lenken nedenfor kan brukes til å tilbakestille Webmin-passordet for $1 for de neste $2 minuttene :
+forgot_enosudo=Sudo er ikke tilgjengelig på dette systemet!
+forgot_ecansudo=Brukeren som ble oppgitt har ikke sudo-tillatelser
+forgot_eunix=Den oppgitte sudo-kompatible brukeren finnes ikke!
--- a/acl/lang/pl.auto
+++ b/acl/lang/pl.auto
@@ -0,0 +1,25 @@
+edit_email=Adres e-mail kontaktowy
+edit_forgot=Wyślij link do resetowania hasła
+
+save_eemail=Adres e-mail nie może zawierać znaku :
+
+log_forgot_send=Wysłano e-mail z resetem hasła dla użytkownika $1 do $2
+log_forgot_reset=Zresetuj hasło dla użytkownika $1 za pomocą adresu e-mail $2
+log_forgot_admin=Administrator wysłał e-mail z resetem hasła dla użytkownika $1 do $2
+
+forgot_title=Wyślij link do resetowania hasła
+forgot_err=Nie udało się wysłać linku do resetowania hasła
+forgot_header=Szczegóły łącza do resetowania hasła
+forgot_user=Zresetuj hasło dla użytkownika
+forgot_email=Metoda dostarczania linków
+forgot_email_def=Wyświetl link w Webmin
+forgot_email_sel=Wyślij link e-mailem na adres
+forgot_send=Wyślij link
+forgot_desc=Ta strona umożliwia wygenerowanie lub wysłanie linku, który może zostać użyty do wybrania nowego hasła dla użytkownika Webmin na dowolny adres e-mail. Uważaj, na jaki adres wysyłasz ten link, ponieważ skutecznie przyzna on pełny dostęp do logowania Webmin!
+forgot_adminmsg=Otrzymujesz tę wiadomość e-mail od administratora systemu Webmin w $3, dla loginu $1.\n\nJeśli chcesz kontynuować resetowanie hasła, kliknij ten link:\n$2
+forgot_sending=Wysyłanie wiadomości e-mail z prośbą o zresetowanie hasła dla $2 do $1 ..
+forgot_sent=.. wysłano
+forgot_link=Poniższy link może zostać użyty do zresetowania hasła Webmin dla $1 na następne $2 minuty :
+forgot_enosudo=Sudo nie jest dostępne w tym systemie!
+forgot_ecansudo=Wprowadzony użytkownik nie ma uprawnień sudo
+forgot_eunix=Podany użytkownik obsługujący sudo nie istnieje!
--- a/acl/lang/pt.auto
+++ b/acl/lang/pt.auto
@@ -27,6 +27,7 @@ edit_title3=Criar usuário Webmin seguro
 edit_readonly=Esse usuário do Webmin não deve ser editado, pois é gerenciado pelo módulo $1. <a href='$2'>Clique aqui</a> para ignorar este aviso e editar o usuário de qualquer maneira - mas lembre-se de que qualquer alteração manual pode ser sobrescrita!
 edit_cloneof=Clonando usuário Webmin
 edit_real=Nome real
+edit_email=E-mail de contato
 edit_group=Membro do grupo
 edit_lock=Nenhuma senha aceita
 edit_pam=Autenticação PAM
@@ -75,6 +76,7 @@ edit_selall=Selecionar tudo
 edit_invert=Seleção invertida
 edit_hide=Ocultar não utilizado
 edit_switch=Mudar para usuário
+edit_forgot=Enviar link para redefinição de senha
 edit_return=Usuário Webmin
 edit_return2=Grupo Webmin
 edit_rbacdeny=Modo de acesso RBAC
@@ -128,6 +130,7 @@ save_edays=Não há dias para permitir selecionados
 save_ehours=Tempos ausentes ou inválidos para permitir
 save_ehours2=A hora de início permitida deve ser antes do final
 save_etemp=A opção de forçar uma alteração de senha no próximo login não pode ser usada, a menos que <a href='$1'>solicite aos usuários que insiram novas senhas</a> esteja ativado
+save_eemail=O endereço de e-mail não pode conter o caractere :

 delete_err=Falha ao excluir usuário
 delete_eself=Você não pode se excluir
@@ -223,6 +226,9 @@ log_sync=Sincronização de usuário unix alterada
 log_sql=Banco de dados de usuário e grupo alterado
 log_twofactor=Usuário registrado $1 com o provedor de dois fatores $2
 log_onefactor=Usuário desinscrito $1 para autenticação de dois fatores
+log_forgot_send=Enviou e-mail de redefinição de senha para o usuário $1 para $2
+log_forgot_reset=Redefinir senha para usuário $1 com e-mail $2
+log_forgot_admin=O administrador enviou um e-mail de redefinição de senha para o usuário $1 para $2

 gedit_ecannot=Você não tem permissão para editar grupos
 gedit_title=Editar grupo Webmin
@@ -485,3 +491,20 @@ twofactor_failed=.. inscrição falhou: $1
 twofactor_done=.. completo. Seu ID com este provedor é <tt>$1</tt>.
 twofactor_setup=A autenticação de dois fatores ainda não foi ativada neste sistema, mas pode ser ativada usando o módulo <a href='$1'>Webmin Configuration</a>.
 twofactor_ebutton=Nenhum botão clicou!
+
+forgot_title=Enviar link para redefinição de senha
+forgot_err=Falha ao enviar link para redefinição de senha
+forgot_header=Detalhes do link para redefinição de senha
+forgot_user=Redefinir senha do usuário
+forgot_email=Método de entrega de links
+forgot_email_def=Exibir link no Webmin
+forgot_email_sel=Enviar link por e-mail para
+forgot_send=Enviar link
+forgot_desc=Esta página permite que você gere ou envie um link que pode ser usado para selecionar uma nova senha para um usuário do Webmin para qualquer endereço de e-mail. Tenha cuidado com o endereço para o qual você envia este link, pois ele efetivamente concederá acesso total ao login do Webmin!
+forgot_adminmsg=Você está recebendo este e-mail do administrador do sistema Webmin em $3, para o login $1.\n\nSe desejar prosseguir com a redefinição da senha, siga este link:\n$2
+forgot_sending=Enviando e-mail de redefinição de senha de $2 para $1 ..
+forgot_sent=.. enviado
+forgot_link=O link abaixo pode ser usado para redefinir a senha do Webmin para $1 pelos próximos $2 minutos :
+forgot_enosudo=Sudo não está disponível neste sistema!
+forgot_ecansudo=O usuário inserido não possui permissões sudo
+forgot_eunix=O usuário habilitado para sudo inserido não existe!
--- a/acl/lang/pt_BR.auto
+++ b/acl/lang/pt_BR.auto
@@ -5,6 +5,7 @@ index_eulist=Falha ao listar usuários: $1
 index_eglist=Falha ao listar grupos: $1

 edit_title3=Criar usuário Webmin seguro
+edit_email=E-mail de contato
 edit_twofactor=Tipo de autenticação de dois fatores
 edit_twofactorprov=Usando o provedor $1 com o ID $2
 edit_twofactorcancel=Remover requisito de autenticação de dois fatores
@@ -12,6 +13,7 @@ edit_twofactornone=Nenhuma configuração ainda
 edit_twofactoradd=Ativar dois fatores para o usuário
 edit_locale=Localidade
 edit_egone=O usuário selecionado não existe mais!
+edit_forgot=Enviar link para redefinição de senha
 edit_proto=Tipo de armazenamento
 edit_proto_mysql=Banco de dados MySQL
 edit_proto_postgresql=Banco de dados PostgreSQL
@@ -24,6 +26,7 @@ edit_unsafe=Redefinir para irrestrito

 save_eunixname=O nome de usuário '$1' não é um usuário Unix e, portanto, não pode ser usado no modo de segurança
 save_etemp=A opção de forçar uma alteração de senha no próximo login não pode ser usada, a menos que <a href='$1'>solicite aos usuários que insiram novas senhas</a> esteja ativado
+save_eemail=O endereço de e-mail não pode conter o caractere :

 delete_eanonuser=Este usuário está sendo usado para acesso anônimo ao módulo

@@ -37,6 +40,9 @@ log_joingroup=Adicionados $1 usuários Webmin ao grupo $2
 log_sql=Banco de dados de usuário e grupo alterado
 log_twofactor=Usuário registrado $1 com o provedor de dois fatores $2
 log_onefactor=Usuário desinscrito $1 para autenticação de dois fatores
+log_forgot_send=Enviou e-mail de redefinição de senha para o usuário $1 para $2
+log_forgot_reset=Redefinir senha para usuário $1 com e-mail $2
+log_forgot_admin=O administrador enviou um e-mail de redefinição de senha para o usuário $1 para $2

 gedit_desc=Descrição do grupo
 gedit_egone=O grupo selecionado não existe mais!
@@ -154,3 +160,20 @@ twofactor_failed=.. inscrição falhou: $1
 twofactor_done=.. completo. Seu ID com este provedor é <tt>$1</tt>.
 twofactor_setup=A autenticação de dois fatores ainda não foi ativada neste sistema, mas pode ser ativada usando o módulo <a href='$1'>Webmin Configuration</a>.
 twofactor_ebutton=Nenhum botão clicou!
+
+forgot_title=Enviar link para redefinição de senha
+forgot_err=Falha ao enviar link para redefinição de senha
+forgot_header=Detalhes do link para redefinição de senha
+forgot_user=Redefinir senha do usuário
+forgot_email=Método de entrega de links
+forgot_email_def=Exibir link no Webmin
+forgot_email_sel=Enviar link por e-mail para
+forgot_send=Enviar link
+forgot_desc=Esta página permite que você gere ou envie um link que pode ser usado para selecionar uma nova senha para um usuário do Webmin para qualquer endereço de e-mail. Tenha cuidado com o endereço para o qual você envia este link, pois ele efetivamente concederá acesso total ao login do Webmin!
+forgot_adminmsg=Você está recebendo este e-mail do administrador do sistema Webmin em $3, para o login $1.\n\nSe desejar prosseguir com a redefinição da senha, siga este link:\n$2
+forgot_sending=Enviando e-mail de redefinição de senha de $2 para $1 ..
+forgot_sent=.. enviado
+forgot_link=O link abaixo pode ser usado para redefinir a senha do Webmin para $1 pelos próximos $2 minutos :
+forgot_enosudo=Sudo não está disponível neste sistema!
+forgot_ecansudo=O usuário inserido não possui permissões sudo
+forgot_eunix=O usuário habilitado para sudo inserido não existe!
--- a/acl/lang/ru.auto
+++ b/acl/lang/ru.auto
@@ -5,6 +5,7 @@ index_eulist=Не удалось составить список пользов
 index_eglist=Не удалось перечислить группы: $1

 edit_title3=Создать безопасный пользователь Webmin
+edit_email=Контактный адрес электронной почты
 edit_twofactor=Тип двухфакторной аутентификации
 edit_twofactorprov=Использование поставщика $1 с идентификатором $2
 edit_twofactorcancel=Удалить требование двухфакторной аутентификации
@@ -13,6 +14,7 @@ edit_twofactoradd=Включить двухфакторный для польз
 edit_locale=Регион
 edit_nochange=Принудительно менять дни?
 edit_egone=Выбранный пользователь больше не существует!
+edit_forgot=Отправить ссылку для сброса пароля
 edit_rbacdeny0=RBAC контролирует только выбранные ACL модуля
 edit_rbacdeny1=RBAC контролирует все модули и ACL
 edit_proto=Тип хранения
@@ -26,6 +28,7 @@ edit_safe1=Только безопасные модули
 edit_unsafe=Сброс на неограниченный

 save_eunixname=Имя пользователя '$1' не является пользователем Unix и поэтому не может использоваться в безопасном режиме
+save_eemail=Адрес электронной почты не может содержать символ :

 delete_eanonuser=Этот пользователь используется для доступа к анонимному модулю

@@ -39,6 +42,9 @@ log_joingroup=Добавлены $1 пользователи Webmin в груп
 log_sql=Изменена база данных пользователей и групп
 log_twofactor=Зарегистрированный пользователь $1 с двухфакторным поставщиком $2
 log_onefactor=Зарегистрированный пользователь $1 для двухфакторной аутентификации
+log_forgot_send=Отправлено электронное письмо для сброса пароля для пользователя $1 пользователю $2
+log_forgot_reset=Сброс пароля для пользователя $1 с адресом электронной почты $2
+log_forgot_admin=Администратор отправил электронное письмо для сброса пароля пользователя $1 пользователю $2

 gedit_desc=Описание группы
 gedit_egone=Выбранная группа больше не существует!
@@ -162,3 +168,20 @@ twofactor_failed=.. регистрация не выполнена: $1
 twofactor_done=.. завершено Ваш идентификатор этого провайдера составляет <tt>$1</tt>.
 twofactor_setup=Двухфакторная аутентификация еще не была включена в этой системе, но ее можно включить с помощью модуля <a href='$1'>Webmin Configuration</a>.
 twofactor_ebutton=Ни одна кнопка не нажата!
+
+forgot_title=Отправить ссылку для сброса пароля
+forgot_err=Не удалось отправить ссылку для сброса пароля
+forgot_header=Подробности ссылки для сброса пароля
+forgot_user=Сбросить пароль пользователя
+forgot_email=Метод доставки ссылки
+forgot_email_def=Показать ссылку в Webmin
+forgot_email_sel=Отправить ссылку по электронной почте
+forgot_send=Отправить ссылку
+forgot_desc=Эта страница позволяет вам сгенерировать или отправить ссылку, которая может быть использована для выбора нового пароля для пользователя Webmin на любой адрес электронной почты. Будьте осторожны, на какой адрес вы отправляете эту ссылку, так как она фактически предоставит полный доступ к логину Webmin!
+forgot_adminmsg=Вы получили это письмо от администратора системы Webmin по адресу $3 для входа в систему $1.\n\nЕсли вы хотите продолжить сброс пароля, перейдите по этой ссылке:\n$2
+forgot_sending=Отправляю электронное письмо для сброса пароля для $2 на $1 ..
+forgot_sent=.. отправил
+forgot_link=Ссылку ниже можно использовать для сброса пароля Webmin для $1 на следующие $2 минуты :
+forgot_enosudo=Sudo недоступен в этой системе!
+forgot_ecansudo=У введенного пользователя нет прав sudo
+forgot_eunix=Введенный пользователь с правами sudo не существует!
--- a/acl/lang/sk.auto
+++ b/acl/lang/sk.auto
@@ -8,6 +8,7 @@ edit_title3=Vytvorte bezpečného používateľa Webmin
 edit_readonly=Tento užívateľ Webmin by nemal byť upravovaný, pretože je spravovaný modulom $1. <a href='$2'>Kliknite tu</a>, aby ste toto upozornenie obišli a upravili používateľa - buďte si však vedomí, že akékoľvek manuálne zmeny môžu byť prepísané!
 edit_cloneof=Klonovanie užívateľa Webmin
 edit_real=Skutočné meno
+edit_email=Kontaktný e-mail
 edit_passlocked=Heslo sa nezmenilo už do $1 dní - účet je zablokovaný!
 edit_passmax=Heslo sa nezmenilo do $1 dní - pri nasledujúcom prihlásení sa musí zmeniť
 edit_passold=Heslo bolo naposledy zmenené pred $1 dňami
@@ -25,6 +26,7 @@ edit_nochange=Vynútiť dni na zmenu hesla?
 edit_egone=Vybraný používateľ už neexistuje!
 edit_overlay=Prekrytie osobnej témy
 edit_overlayglobal=Žiadne - použite predvolené motívy
+edit_forgot=Odoslať odkaz na obnovenie hesla
 edit_rbacdeny0=RBAC riadi iba vybrané ACL modulov
 edit_rbacdeny1=RBAC riadi všetky moduly a ACL
 edit_global=Povolenia pre všetky moduly
@@ -53,6 +55,7 @@ save_edays=Vybraté nie sú žiadne dni na povolenie
 save_ehours=Chýbajúce alebo neplatné časy na povolenie
 save_ehours2=Čas začiatku, ktorý sa má povoliť, musí byť pred koncom
 save_etemp=Možnosť vynútiť zmenu hesla pri ďalšom prihlásení nie je možné použiť, pokiaľ nie je povolená možnosť <a href='$1'>vyzývajúca používateľov na zadanie nových hesiel</a>.
+save_eemail=E-mailová adresa nemôže obsahovať znak :

 delete_eanonuser=Tento užívateľ sa používa na anonymný prístup k modulu

@@ -73,6 +76,9 @@ log_sync=Zmenená synchronizácia unixového používateľa
 log_sql=Zmenená databáza používateľov a skupín
 log_twofactor=Registrovaný používateľ $1 s dvojfaktorovým poskytovateľom $2
 log_onefactor=Registrovaný používateľ $1 na dvojfaktorové overenie
+log_forgot_send=E-mail na obnovenie hesla odoslaný pre používateľa $1 používateľovi $2
+log_forgot_reset=Obnoviť heslo pre používateľa $1 s e-mailom $2
+log_forgot_admin=Správca odoslal e-mail na obnovenie hesla pre používateľa $1 používateľovi $2

 gedit_members=Používatelia a skupiny členov
 gedit_desc=Popis skupiny
@@ -247,3 +253,20 @@ twofactor_failed=.. zápis zlyhal: $1
 twofactor_done=.. dokončené. Vaše ID u tohto poskytovateľa je <tt>$1</tt>.
 twofactor_setup=V tomto systéme zatiaľ nie je povolená dvojfaktorová autentifikácia, ale dá sa zapnúť pomocou modulu <a href='$1'>Webmin Configuration</a>.
 twofactor_ebutton=Klikli na žiadne tlačidlo!
+
+forgot_title=Odoslať odkaz na obnovenie hesla
+forgot_err=Odoslanie odkazu na obnovenie hesla zlyhalo
+forgot_header=Podrobnosti o odkaze na obnovenie hesla
+forgot_user=Obnoviť heslo pre používateľa
+forgot_email=Spôsob doručenia odkazu
+forgot_email_def=Zobraziť odkaz vo Webmine
+forgot_email_sel=Poslať odkaz e-mailom na
+forgot_send=Odoslať odkaz
+forgot_desc=Táto stránka vám umožňuje vygenerovať alebo odoslať odkaz, ktorý možno použiť na výber nového hesla pre používateľa Webminu na ľubovoľnú e-mailovú adresu. Buďte opatrní, na ktorú adresu tento odkaz odosielate, pretože vám v podstate poskytne plný prístup k prihláseniu do Webminu!
+forgot_adminmsg=Tento e-mail ste dostali od administrátora systému Webmin na adrese $3 pre prihlasovacie údaje $1.\n\nAk chcete pokračovať v obnovení hesla, kliknite na tento odkaz:\n$2
+forgot_sending=Odosielanie e-mailu na obnovenie hesla pre $2 na $1 ..
+forgot_sent=.. odoslané
+forgot_link=Nižšie uvedený odkaz možno použiť na obnovenie hesla Webmin pre $1 na nasledujúcich $2 minút :
+forgot_enosudo=Sudo nie je na tomto systéme k dispozícii!
+forgot_ecansudo=Zadaný používateľ nemá oprávnenia sudo
+forgot_eunix=Zadaný používateľ s podporou sudo neexistuje!
--- a/acl/lang/sv.auto
+++ b/acl/lang/sv.auto
@@ -5,6 +5,7 @@ index_eulist=Det gick inte att lista användare: $1
 index_eglist=Det gick inte att lista grupper: $1

 edit_title3=Skapa säker Webmin-användare
+edit_email=Kontakt-e-postadress
 edit_twofactor=Tvåfaktors autentiseringstyp
 edit_twofactorprov=Använda leverantör $1 med ID $2
 edit_twofactorcancel=Ta bort tvåfaktors autentiseringskrav
@@ -12,6 +13,7 @@ edit_twofactornone=Ingen installation ännu
 edit_twofactoradd=Aktivera tvåfaktorer för användare
 edit_locale=Plats
 edit_egone=Den valda användaren finns inte längre!
+edit_forgot=Skicka länk för återställning av lösenord
 edit_proto=Lagringstyp
 edit_proto_mysql=MySQL-databas
 edit_proto_postgresql=PostgreSQL-databas
@@ -26,6 +28,7 @@ save_eunixname=Användarnamnet '$1' är inte en Unix-användare och kan därför
 save_eoverlay=Ett temaöverlägg kan inte väljas om inte ett tema är det
 save_eminsize=Saknad eller icke-numerisk minsta lösenordslängd
 save_etemp=Alternativet att tvinga lösenordsändring vid nästa inloggning kan inte användas om <a href='$1'>uppmanar användare att ange nya lösenord</a> är aktiverat
+save_eemail=E-postadressen får inte innehålla tecknet :

 delete_eanonuser=Den här användaren används för anonym modulåtkomst

@@ -41,6 +44,9 @@ log_sync=Ändrad unix användarsynkronisering
 log_sql=Ändrad användare och gruppdatabas
 log_twofactor=Registrerad användare $1 med tvåfaktureleverantör $2
 log_onefactor=Inskrivna användare $1 för tvåfaktorautentisering
+log_forgot_send=Skickade e-postmeddelande för återställning av lösenord för användare $1 till $2
+log_forgot_reset=Återställ lösenord för användare $1 med e-postadress $2
+log_forgot_admin=Administratören skickade ett e-postmeddelande med lösenordsåterställning för användaren $1 till $2

 gedit_desc=Gruppbeskrivning
 gedit_egone=Den valda gruppen finns inte längre!
@@ -162,3 +168,20 @@ twofactor_failed=.. anmälan misslyckades: $1
 twofactor_done=.. komplett. Ditt ID med denna leverantör är <tt>$1</tt>.
 twofactor_setup=Tvåfaktorsautentisering har inte aktiverats i det här systemet ännu, men kan aktiveras med <a href='$1'>Webmin Configuration</a> -modulen.
 twofactor_ebutton=Ingen knapp klickade!
+
+forgot_title=Skicka länk för återställning av lösenord
+forgot_err=Misslyckades med att skicka länken för återställning av lösenord
+forgot_header=Detaljer om länken för återställning av lösenord
+forgot_user=Återställ lösenord för användaren
+forgot_email=Länkleveransmetod
+forgot_email_def=Visa länk i Webmin
+forgot_email_sel=Skicka länk via e-post till
+forgot_send=Skicka länk
+forgot_desc=Den här sidan låter dig generera eller skicka en länk som kan användas för att välja ett nytt lösenord för en Webmin-användare till vilken e-postadress som helst. Var försiktig med vilken adress du skickar den här länken till, eftersom den i praktiken ger fullständig åtkomst till Webmin-inloggningen!
+forgot_adminmsg=Du får detta e-postmeddelande från administratören för Webmin-systemet på $3, för inloggningen $1.\n\nOm du vill fortsätta med att återställa lösenordet, följ den här länken:\n$2
+forgot_sending=Skickar e-post för återställning av lösenord för $2 till $1 ..
+forgot_sent=.. skickat
+forgot_link=Länken nedan kan användas för att återställa Webmin-lösenordet för $1 under de kommande $2 minuterna :
+forgot_enosudo=Sudo är inte tillgängligt på det här systemet!
+forgot_ecansudo=Den angivna användaren har inte sudo-behörigheter
+forgot_eunix=Den angivna sudo-kapabla användaren finns inte!
--- a/acl/lang/tr.auto
+++ b/acl/lang/tr.auto
@@ -10,6 +10,7 @@ edit_title3=Güvenli Webmin Kullanıcısı Oluşturun
 edit_readonly=Bu Webmin kullanıcısı $1 modülü tarafından yönetildiği için düzenlenmemelidir. Bu uyarıyı atlamak ve kullanıcıyı yine de düzenlemek için <a href='$2'>burayı tıklayın</a> - ancak manuel değişikliklerin üzerine yazılabileceğini unutmayın!
 edit_cloneof=Webmin kullanıcısını kopyalama
 edit_real=Gerçek ad
+edit_email=İletişim e-postası
 edit_passlocked=$1 gün boyunca şifre değiştirilmedi - hesap kilitlendi!
 edit_passmax=$1 gün boyunca şifre değiştirilmedi - bir sonraki girişte değiştirilmelidir
 edit_passold=Şifre en son değiştirildi $1 gün önce
@@ -28,6 +29,7 @@ edit_nochange=Şifre değiştirme günleri uygulansın mı?
 edit_egone=Seçilen kullanıcı artık mevcut değil!
 edit_overlay=Kişisel tema kaplaması
 edit_overlayglobal=Yok - tema varsayılanlarını kullan
+edit_forgot=Şifre Sıfırlama Bağlantısını Gönder
 edit_rbacdeny=RBAC erişim modu
 edit_rbacdeny0=RBAC yalnızca seçilen modül ACL'lerini kontrol eder
 edit_rbacdeny1=RBAC tüm modülleri ve ACL'leri kontrol eder
@@ -63,6 +65,7 @@ save_edays=Seçime izin verilecek gün yok
 save_ehours=İzin vermek için eksik veya geçersiz zamanlar
 save_ehours2=İzin vermek için başlangıç zamanı bitmeden olmalıdır
 save_etemp=<a href='$1'>kullanıcılardan yeni şifreler girmelerini istemediklerinde</a> bir sonraki girişte şifre değişikliğini zorlama seçeneği kullanılamaz
+save_eemail=E-posta adresi : karakterini içeremez

 delete_eanonuser=Bu kullanıcı anonim modül erişimi için kullanılıyor

@@ -85,6 +88,9 @@ log_sync=Unix kullanıcı senkronizasyonu değiştirildi
 log_sql=Değişen kullanıcı ve grup veritabanı
 log_twofactor=İki faktörlü $2 ile kayıtlı $1 kullanıcısı
 log_onefactor=İki faktörlü kimlik doğrulama için kaydı iptal edilen $1 kullanıcısı
+log_forgot_send=$1 kullanıcısı için $2'ye şifre sıfırlama e-postası gönderildi
+log_forgot_reset=$2 e-posta adresine sahip $1 kullanıcısı için şifreyi sıfırla
+log_forgot_admin=Yönetici $1 - $2 kullanıcısı için parola sıfırlama e-postası gönderdi

 gedit_members=Üye kullanıcılar ve gruplar
 gedit_desc=Grup açıklaması
@@ -268,3 +274,20 @@ twofactor_failed=.. kayıt başarısız oldu: $1
 twofactor_done=.. tamamlayınız. Bu sağlayıcıdaki kimliğiniz <tt>$1</tt>.
 twofactor_setup=İki faktörlü kimlik doğrulama henüz bu sistemde etkinleştirilmedi, ancak <a href='$1'>Webmin Yapılandırması</a> modülü kullanılarak açılabilir.
 twofactor_ebutton=Hiçbir düğme tıklanmadı!
+
+forgot_title=Şifre Sıfırlama Bağlantısını Gönder
+forgot_err=Şifre sıfırlama bağlantısı gönderilemedi
+forgot_header=Şifre sıfırlama bağlantısı ayrıntıları
+forgot_user=Kullanıcı için şifreyi sıfırla
+forgot_email=Bağlantı teslim yöntemi
+forgot_email_def=Bağlantıyı Webmin'de görüntüle
+forgot_email_sel=Bağlantıyı e-posta ile gönder
+forgot_send=Bağlantıyı Gönder
+forgot_desc=Bu sayfa, bir Webmin kullanıcısı için yeni bir parola seçmek için kullanılabilecek bir bağlantı oluşturmanıza veya herhangi bir e-posta adresine göndermenize olanak tanır. Bu bağlantıyı hangi adrese gönderdiğinize dikkat edin, çünkü bu, Webmin oturum açma işlemine tam erişim sağlayacaktır!
+forgot_adminmsg=Bu e-postayı, $3 adresindeki Webmin sisteminin yöneticisinden, $1 girişi için alıyorsunuz.\n\nŞifreyi sıfırlamaya devam etmek istiyorsanız, şu bağlantıyı izleyin:\n$2
+forgot_sending=$2 için şifre sıfırlama e-postası $1 adresine gönderiliyor ..
+forgot_sent=.. gönderilmiş
+forgot_link=Aşağıdaki bağlantı $1 için Webmin şifresini önümüzdeki $2 dakika boyunca sıfırlamak için kullanılabilir :
+forgot_enosudo=Bu sistemde Sudo mevcut değil!
+forgot_ecansudo=Girilen kullanıcı sudo izinlerine sahip değil
+forgot_eunix=Girilen sudo-capable kullanıcı bulunamadı!
--- a/acl/lang/uk.auto
+++ b/acl/lang/uk.auto
@@ -34,6 +34,7 @@ edit_rights=Права доступу користувачів Webmin
 edit_user=Ім'я користувача
 edit_cloneof=Клонування користувача Webmin
 edit_real=Справжнє ім'я
+edit_email=Контактна електронна адреса
 edit_group=Член групи
 edit_pass=Пароль
 edit_same=Те саме, що Unix
@@ -88,6 +89,7 @@ edit_selall=Вибрати все
 edit_invert=Інвертувати вибір
 edit_hide=Сховати невикористаним
 edit_switch=Переключитися на користувача
+edit_forgot=Надіслати посилання для скидання пароля
 edit_return2=Група Вебмін
 edit_rbacdeny=Режим доступу RBAC
 edit_rbacdeny0=RBAC керує лише вибраними модулями ACL
@@ -145,6 +147,7 @@ save_edays=Немає днів, щоб дозволити вибране
 save_ehours=Відсутній або недійсний час для дозволу
 save_ehours2=Час початку дозволення повинен бути до кінця
 save_etemp=Параметр примусити змінити пароль при наступному вході не можна використовувати, якщо <a href='$1'>спонукає користувачів вводити нові паролі</a>
+save_eemail=Адреса електронної пошти не може містити символ :

 delete_eself=Ви не можете видалити себе
 delete_ecannot=Вам заборонено видаляти користувачів
@@ -242,6 +245,9 @@ log_sync=Змінено синхронізацію користувача Unix
 log_sql=Змінено базу даних користувачів та груп
 log_twofactor=Зареєстрований користувач $1 з двофакторним постачальником $2
 log_onefactor=Користувач, який не був зареєстрований, $1 для двофакторної аутентифікації
+log_forgot_send=Надіслано електронного листа для скидання пароля для користувача $1 до $2
+log_forgot_reset=Скинути пароль для користувача $1 з електронною поштою $2
+log_forgot_admin=Адміністратор надіслав електронного листа для скидання пароля для користувача $1 користувачу $2

 gedit_ecannot=Вам заборонено редагувати групи
 gedit_title=Редагування групи Webmin
@@ -504,3 +510,20 @@ twofactor_failed=.. реєстрація не вдалася: $1
 twofactor_done=.. завершено. Ваш ідентифікатор у цього постачальника <tt>$1</tt>.
 twofactor_setup=Двофакторна автентифікація ще не ввімкнена в цій системі, але її можна ввімкнути за допомогою модуля <a href='$1'>Конфігурація Webmin</a>.
 twofactor_ebutton=Жодна кнопка не натиснута!
+
+forgot_title=Надіслати посилання для скидання пароля
+forgot_err=Не вдалося надіслати посилання для скидання пароля
+forgot_header=Деталі посилання для скидання пароля
+forgot_user=Скинути пароль для користувача
+forgot_email=Спосіб доставки посилання
+forgot_email_def=Відобразити посилання у Webmin
+forgot_email_sel=Надіслати посилання електронною поштою на
+forgot_send=Надіслати посилання
+forgot_desc=Ця сторінка дозволяє вам згенерувати або надіслати посилання, яке можна використовувати для вибору нового пароля для користувача Webmin, на будь-яку адресу електронної пошти. Будьте уважні, на яку адресу ви надсилаєте це посилання, оскільки воно фактично надасть повний доступ до входу в Webmin!
+forgot_adminmsg=Ви отримали цей електронний лист від адміністратора системи Webmin за адресою $3, для входу $1.\n\nЯкщо ви хочете продовжити скидання пароля, перейдіть за цим посиланням:\n$2
+forgot_sending=Надсилання електронного листа для скидання пароля для $2 на $1 ..
+forgot_sent=.. відправлено
+forgot_link=Посилання нижче можна використовувати для скидання пароля Webmin для $1 протягом наступних $2 хвилин :
+forgot_enosudo=Sudo недоступний на цій системі!
+forgot_ecansudo=Введений користувач не має прав sudo
+forgot_eunix=Введений користувач із підтримкою sudo не існує!
--- a/acl/lang/zh.auto
+++ b/acl/lang/zh.auto
@@ -1,5 +1,30 @@
+edit_email=联系邮箱
 edit_egone=选定的用户不再存在！
+edit_forgot=发送密码重置链接
+
+save_eemail=电子邮件地址不能包含：字符

 cert_ebrowser=Webmin 不知道如何为您的浏览器颁发客户端证书 ($1)

+log_forgot_send=已将用户 $1 的密码重置电子邮件发送至 $2
+log_forgot_reset=为电子邮件为 $2 的用户 $1 重置密码
+log_forgot_admin=管理员已将用户 $1 的密码重置电子邮件发送给 $2
+
 gsave_edesc=无效描述 - 不允许使用 : 字符
+
+forgot_title=发送密码重置链接
+forgot_err=无法发送密码重置链接
+forgot_header=密码重置链接详情
+forgot_user=重置用户密码
+forgot_email=链接传递方式
+forgot_email_def=在 Webmin 中显示链接
+forgot_email_sel=通过电子邮件发送链接至
+forgot_send=发送链接
+forgot_desc=此页面允许您生成或发送一个链接，该链接可用于为 Webmin 用户选择新密码，并发送到任何电子邮件地址。请谨慎选择发送此链接的地址，因为它实际上会授予 Webmin 登录的完全访问权限！
+forgot_adminmsg=您将收到来自 $3 的 Webmin 系统管理员的这封电子邮件，登录名为 $1。\n\n如果您想继续重置密码，请点击此链接:\n$2
+forgot_sending=正在将 $2 的密码重置电子邮件发送至 $1 ..
+forgot_sent=.. 发送
+forgot_link=下面的链接可用于重置 $1 在接下来的 $2 分钟内的 Webmin 密码：
+forgot_enosudo=Sudo 在本系统上不可用！
+forgot_ecansudo=输入的用户没有 sudo 权限
+forgot_eunix=输入的具有 sudo 权限的用户不存在！
--- a/acl/lang/zh_TW.auto
+++ b/acl/lang/zh_TW.auto
@@ -10,6 +10,7 @@ edit_title3=創建安全的Webmin用戶
 edit_readonly=該Webmin用戶不能編輯，因為它是由 $1 模塊管理的。 <a href='$2'>單擊此處</a>以繞過此警告並仍然編輯用戶-但請注意，任何手動更改都可能被覆蓋！
 edit_cloneof=克隆Webmin用戶
 edit_real=真正的名字
+edit_email=聯絡信箱
 edit_passlocked=$1 天未更改密碼-帳戶已鎖定！
 edit_passmax=$1 天未更改密碼-下次登錄時必須更改
 edit_passold=密碼最後一次更改是 $1 天前
@@ -30,6 +31,7 @@ edit_overlay=個人主題疊加
 edit_overlayglobal=無-使用主題默認值
 edit_hide=隱藏未使用
 edit_switch=切換到用戶
+edit_forgot=發送密碼重設連結
 edit_return=Webmin用戶
 edit_return2=Webmin組
 edit_rbacdeny=RBAC訪問模式
@@ -67,6 +69,7 @@ save_edays=沒有天數可供選擇
 save_ehours=缺少時間或無效時間
 save_ehours2=允許的開始時間必須在結束之前
 save_etemp=除非啟用了<a href='$1'>提示用戶輸入新密碼</a>的選項，否則不能使用在下次登錄時強制更改密碼的選項。
+save_eemail=電子郵件地址不能包含：字符

 delete_eanonuser=該用戶正用於匿名模塊訪問

@@ -93,6 +96,9 @@ log_sync=更改了Unix用戶同步
 log_sql=更改的用戶和組數據庫
 log_twofactor=使用兩因素提供程序 $2 的已註冊用戶 $1
 log_onefactor=取消註冊用戶 $1 進行雙重身份驗證
+log_forgot_send=已將使用者 $1 的密碼重設電子郵件傳送至 $2
+log_forgot_reset=為電子郵件為 $2 的使用者 $1 重設密碼
+log_forgot_admin=管理員已將使用者 $1 的密碼重設電子郵件傳送給 $2

 gedit_members=會員用戶和組
 gedit_desc=團體簡介
@@ -296,3 +302,20 @@ twofactor_failed=..註冊失敗： $1
 twofactor_done=..完成。您在此提供程序處的ID是<tt>$1</tt>。
 twofactor_setup=此系統上尚未啟用兩因素身份驗證，但可以使用<a href='$1'>Webmin Configuration</a>模塊將其打開。
 twofactor_ebutton=沒有點擊按鈕！
+
+forgot_title=發送密碼重設連結
+forgot_err=無法發送密碼重設鏈接
+forgot_header=密碼重置連結詳情
+forgot_user=重置用戶密碼
+forgot_email=連結傳遞方式
+forgot_email_def=在 Webmin 中顯示鏈接
+forgot_email_sel=透過電子郵件發送連結至
+forgot_send=發送連結
+forgot_desc=此頁面可讓您產生或傳送可用於為 Webmin 使用者選擇新密碼的連結至任何電子郵件地址。請小心將此連結傳送到哪個位址，因為它將有效授予對 Webmin 登入的完全存取權！
+forgot_adminmsg=您將收到來自 $3 的 Webmin 系統管理員的這封電子郵件，登入名為 $1。 \n\n如果您想繼續重設密碼，請點擊此連結:\n$2
+forgot_sending=正在將 $2 的密碼重設電子郵件發送至 $1 ..
+forgot_sent=.. 發送
+forgot_link=下面的連結可用於重設 $1 在接下來的 $2 分鐘內的 Webmin 密碼：
+forgot_enosudo=Sudo 在本系統上不可用！
+forgot_ecansudo=輸入的使用者沒有 sudo 權限
+forgot_eunix=輸入的具有 sudo 權限的使用者不存在！
--- a/acl/list_sessions.cgi
+++ b/acl/list_sessions.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, %sessiondb);
 $access{'sessions'} || &error($text{'sessions_ecannot'});
 &ui_print_header(undef, $text{'sessions_title'}, "");
@@ -28,7 +28,7 @@ print &ui_columns_start([ $text{'sessions_id'},
 			  $text{'sessions_state'},
 			  $text{'sessions_user'},
 			  $text{'sessions_host'},
-			  $text{'sessions_login'},
+			  $text{'sessions_login_ago'},
 			  $text{'sessions_actions'},
 			], 100);
 foreach my $k (sort { my @a = split(/\s+/, $sessiondb{$a});
@@ -68,7 +68,8 @@ foreach my $k (sort { my @a = split(/\s+/, $sessiondb{$a});
 		push(@cols, $user);
 		}
 	push(@cols, $lip);
-	push(@cols, &make_date($ltime));
+	push(@cols, &make_date_relative($ltime).
+			"&nbsp;".&ui_help(&make_date($ltime)));
 	my @links;
 	if ($haslog) {
 		push(@links, ui_link("../webminlog/search.cgi?uall=1&mall=1&tall=1&wall=1&fall=1&sid=$k", $text{'sessions_lview'}));
--- a/acl/log_parser.pl
+++ b/acl/log_parser.pl
@@ -16,8 +16,9 @@ my ($user, $script, $action, $type, $object, $p) = @_;
 my $g = $type eq 'group' ? "_g" : "";
 if ($action eq 'modify') {
 	if ($p->{'old'} ne $p->{'name'}) {
-		return &text('log_rename'.$g, "<tt>$p->{'old'}</tt>",
-					      "<tt>$p->{'name'}</tt>");
+		return &text('log_rename'.$g,
+			     "<tt>".&html_escape($p->{'old'})."</tt>",
+			     "<tt>".&html_escape($p->{'name'})."</tt>");
 		}
 	else {
 		return &text('log_modify'.$g,
@@ -26,7 +27,8 @@ if ($action eq 'modify') {
 	}
 elsif ($action eq 'create') {
 	if ($p->{'clone'}) {
-		return &text('log_clone'.$g, "<tt>$p->{'clone'}</tt>",
+		return &text('log_clone'.$g,
+			     "<tt>".&html_escape($p->{'clone'})."</tt>",
 			     "<tt>".&html_escape($object)."</tt>");
 		}
 	else {
@@ -36,21 +38,23 @@ elsif ($action eq 'create') {
 	}
 elsif ($action eq 'delete') {
 	if ($type eq "users" || $type eq "groups") {
-		return &text('log_delete_'.$type, $object);
+		return &text('log_delete_'.$type, &html_escape($object));
 		}
 	else {
-		return &text('log_delete'.$g, "<tt>$object</tt>");
+		return &text('log_delete'.$g,
+			     "<tt>".&html_escape($object)."</tt>");
 		}
 	}
 elsif ($action eq 'joingroup') {
-	return &text('log_joingroup', $object, $p->{'group'});
+	return &text('log_joingroup', &html_escape($object),
+		     &html_escape($p->{'group'}));
 	}
 elsif ($action eq 'acl') {
-	return &text('log_acl', "<tt>$object</tt>",
+	return &text('log_acl', "<tt>".&html_escape($object)."</tt>",
 		     "<i>".&html_escape($p->{'moddesc'})."</i>");
 	}
 elsif ($action eq 'reset') {
-	return &text('log_reset', "<tt>$object</tt>",
+	return &text('log_reset', "<tt>".&html_escape($object)."</tt>",
 		     "<i>".&html_escape($p->{'moddesc'})."</i>");
 	}
 elsif ($action eq 'cert') {
@@ -60,7 +64,9 @@ elsif ($action eq 'switch') {
 	return &text('log_switch', "<tt>".&html_escape($object)."</tt>");
 	}
 elsif ($action eq 'twofactor') {
-	return &text('log_twofactor', $object, $p->{'provider'}, $p->{'id'});
+	return &text('log_twofactor', &html_escape($object),
+		     &html_escape($p->{'provider'}),
+		     &html_escape($p->{'id'}));
 	}
 elsif ($action eq 'forgot') {
 	return &text('log_forgot_'.$type, &html_escape($p->{'user'}),
--- a/acl/makedn.cgi
+++ b/acl/makedn.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'sql_ecannot'});
 &ReadParse();
--- a/acl/maketables.cgi
+++ b/acl/maketables.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'sql_ecannot'});
 &ReadParse();
--- a/acl/postinstall.pl
+++ b/acl/postinstall.pl
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require 'acl-lib.pl';
+require 'acl-lib.pl';    ## no critic
 our ($config_directory);

 # Rename the .acl files for any groups to .gacl files
--- a/acl/save_acl.cgi
+++ b/acl/save_acl.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $base_remote_user, %gconfig,
     $config_directory);
 &ReadParse();
@@ -54,13 +54,8 @@ else {
 	if (defined($in{'noconfig'})) {
 		$maccess{'noconfig'} = $in{'noconfig'};
 		}
-	if ($in{'rbac'}) {
-		# RBAC overrides everything
-		$maccess{'rbac'} = 1;
-		}
-	elsif (-r "../$in{'_acl_mod'}/acl_security.pl") {
+	if (-r "../$in{'_acl_mod'}/acl_security.pl") {
 		# Use user inputs
-		$maccess{'rbac'} = 0 if (defined($in{'rbac'}));
 		&foreign_require($in{'_acl_mod'}, "acl_security.pl");
 		&foreign_call($in{'_acl_mod'}, "acl_security_save",
 			      \%maccess, \%in);
--- a/acl/save_group.cgi
+++ b/acl/save_group.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $config_directory);
 &ReadParse();

--- a/acl/save_pass.cgi
+++ b/acl/save_pass.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'pass_ecannot'});
 &error_setup($text{'pass_err'});
--- a/acl/save_sql.cgi
+++ b/acl/save_sql.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'sql_ecannot'});
 &ReadParse();
--- a/acl/save_sync.cgi
+++ b/acl/save_sync.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $module_config_directory);
 &ReadParse();
 $access{'sync'} && $access{'create'} && $access{'delete'} ||
--- a/acl/save_twofactor.cgi
+++ b/acl/save_twofactor.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $base_remote_user);
 &foreign_require("webmin");
 &error_setup($text{'twofactor_err'});
@@ -55,7 +55,7 @@ if ($in{'enable'}) {
 		my $mfunc = "webmin::message_twofactor_".
 			    $miniserv{'twofactor_provider'};
 		if (defined(&{\&{$mfunc}})) {
-			print &{\&{$mfunc}}($user);
+			print "<p></p>".&{\&{$mfunc}}($user);
 			}

 		# Save user
@@ -65,6 +65,19 @@ if ($in{'enable'}) {
 		&webmin_log("twofactor", "user", $user->{'name'},
 			    { 'provider' => $user->{'twofactor_provider'},
 			      'id' => $user->{'twofactor_id'} });
+
+		# Show a test form only when enrolling for yourself
+		if ($user->{'name'} eq $base_remote_user) {
+			print &ui_form_start("test_twofactor.cgi");
+			print &ui_tag('p', $text{'twofactor_testdesc'});
+			print &ui_tag('p', "$text{'twofactor_testfield'}".
+					   "&nbsp;&nbsp;".
+					   &ui_textbox("test", undef, 12));
+			print &ui_hidden("user", $in{'user'}) if ($in{'user'});
+			print &ui_tag('p');
+			print &ui_form_end([ [ undef,
+				$text{'twofactor_test'} ] ]);
+			}
 		}

 	&ui_print_footer("", $text{'index_return'});
--- a/acl/save_unix.cgi
+++ b/acl/save_unix.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 &ReadParse();
 &error_setup($text{'unix_err'});
@@ -70,7 +70,7 @@ else {
 	}
 if ($in{'sudo'}) {
 	&has_command("sudo") || &error(&text('unix_esudo', "<tt>sudo</tt>"));
-	eval "use IO::Pty";
+	eval { require IO::Pty; IO::Pty->import; 1 };
 	$@ && &error(&text('unix_esudomod', "<tt>IO::Pty</tt>"));
 	}
 $miniserv{'sudo'} = $in{'sudo'};
--- a/acl/save_user.cgi
+++ b/acl/save_user.cgi
@@ -6,7 +6,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $config_directory, $base_remote_user);
 &foreign_require("webmin", "webmin-lib.pl");
 &ReadParse();
@@ -105,11 +105,6 @@ foreach my $u (@ulist) {
 # Find the current group
 my $oldgroup = $in{'old'} ? &get_users_group($in{'old'}) : undef;

-if (&supports_rbac()) {
-	# Save RBAC mode
-	$user{'rbacdeny'} = $in{'rbacdeny'};
-	}
-
 my $newgroup;
 if (defined($in{'group'})) {
 	# Check if group is allowed
@@ -374,11 +369,13 @@ else {
 	}

 my $aclfile = "$config_directory/$in{'name'}.acl";
-if ($in{'old'} && $in{'acl_security_form'} && !$newgroup && !$in{'safe'}) {
-	# Update user's global ACL
+if ($in{'acl_security_form'} && !$newgroup && !$in{'safe'}) {
+	# Update user's global ACL, and merge in RPC setting which has
+	# been moved out of this form
 	&foreign_require("", "acl_security.pl");
 	my %uaccess;
 	&foreign_call("", "acl_security_save", \%uaccess, \%in);
+	$uaccess{'rpc'} = $in{'rpc'};
 	&lock_file($aclfile);
 	&save_module_acl(\%uaccess, $in{'name'}, "", 1);
 	&set_ownership_permissions(undef, undef, 0640, $aclfile);
--- a/acl/schema.cgi
+++ b/acl/schema.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access);
 $access{'pass'} || &error($text{'sql_ecannot'});

--- a/acl/switch.cgi
+++ b/acl/switch.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, %sessiondb);
 &ReadParse();
 &can_edit_user($in{'user'}) && $access{'switch'} ||
--- a/acl/system_info.pl
+++ b/acl/system_info.pl
@@ -20,7 +20,12 @@ foreach my $k (keys %sessiondb) {
 	next if ($k =~ /^1111111/);
 	next if (!$sessiondb{$k});
 	my ($user, $ltime, $lip) = split(/\s+/, $sessiondb{$k});
-	next if ($user ne $remote_user && $user ne "!".$remote_user);
+	next if (&webmin_user_is_admin()
+		? ($user eq "!" ||
+		   ($user ne $remote_user &&
+		    # Show all logins for past 3 days for admin
+		    $ltime && $ltime < time() - 3*24*60*60))
+		: ($user ne $remote_user && $user ne "!".$remote_user));
 	push(@logins, [ $user, $ltime, $lip, $k ]);
 	}
 if (@logins) {
@@ -29,7 +34,8 @@ if (@logins) {
 		@logins = @logins[0..4];
 		}
 	my $html = &ui_columns_start([ $text{'sessions_host'},
-				       $text{'sessions_login'},
+				       $text{'sessions_user'},
+				       $text{'sessions_login_ago'},
 				       $text{'sessions_state'},
 				       $text{'sessions_action'} ]);
 	my $open = 0;
@@ -62,9 +68,13 @@ if (@logins) {
 		         &ui_link("@{[&get_webprefix()]}/acl/delete_session.cgi?id=$l->[3]&redirect_ref=1",
 		         $text{'sessions_kill'}))
 			}
+		my $user = $l->[0];
+		$user =~ s/^\!//;
 		$html .= &ui_columns_row([
 		          $l->[2],
-		          &make_date($l->[1]),
+		          $user,
+		          &make_date_relative($l->[1]).
+			  	"&nbsp;".&ui_help(&make_date($l->[1])),
 		          $state,
 			  &ui_links_row(\@links) ]);
 		}
--- a/acl/t/perlcritic.t
+++ b/acl/t/perlcritic.t
@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use Test::More;
+
+BEGIN {
+    eval { require Perl::Critic; 1 }
+        or plan skip_all => 'Perl::Critic not installed';
+}
+
+use File::Find;
+
+sub script_dir
+{
+    my $path = $0;
+    if ($path =~ m{^/}) {
+        $path =~ s{/[^/]+$}{};
+        return $path;
+    }
+    my $cwd = `pwd`;
+    chomp($cwd);
+    if ($path =~ m{/}) {
+        $path =~ s{/[^/]+$}{};
+        return $cwd.'/'.$path;
+    }
+    return $cwd;
+}
+
+my $bindir = script_dir();
+my $module_dir = "$bindir/..";
+chdir($module_dir) or die "chdir: $!";
+
+my @files;
+find(
+    sub {
+        return if -d;
+        # Skip symlinks: shared libs (e.g. md5-lib.pl -> ../useradmin/md5-lib.pl)
+        # belong to the module that owns the underlying file.
+        return if -l;
+        return unless /\.(pl|cgi)\z/;
+        # *.info.pl is the Polish-locale translation of *.info, not Perl code.
+        return if /\.info\.pl\z/;
+        push(@files, $File::Find::name);
+    },
+    '.'
+);
+
+@files = sort @files;
+if (!@files) {
+    plan skip_all => 'no perl files to check';
+}
+
+my $critic = Perl::Critic->new(
+    -profile => "$bindir/../../.perlcriticrc",
+);
+
+foreach my $file (@files) {
+    my @violations = $critic->critique($file);
+    is(scalar @violations, 0, "$file perlcritic");
+    if (@violations) {
+        diag join("", @violations);
+    }
+}
+
+done_testing();
--- a/acl/t/run-tests.t
+++ b/acl/t/run-tests.t
--- a/acl/test_twofactor.cgi
+++ b/acl/test_twofactor.cgi
@@ -0,0 +1,47 @@
+#!/usr/local/bin/perl
+# Validate a user-supplied two-factor token
+
+use strict;
+use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
+require './acl-lib.pl';    ## no critic
+our (%in, %text, %access, $base_remote_user);
+&foreign_require("webmin");
+&error_setup($text{'twofactor_terr'});
+&ReadParse();
+
+# Get the user
+my @users = &list_users();
+my $user;
+if ($in{'user'}) {
+	&can_edit_user($in{'user'}) || &error($text{'edit_euser'});
+	($user) = grep { $_->{'name'} eq $in{'user'} } @users;
+	}
+else {
+	($user) = grep { $_->{'name'} eq $base_remote_user } @users;
+	}
+$user || &error($text{'twofactor_euser'});
+$user->{'twofactor_provider'} || &error($text{'twofactor_etestuser'});
+my @provs = &webmin::list_twofactor_providers();
+my ($prov) = grep { $_->[0] eq $user->{'twofactor_provider'} } @provs;
+
+# Call the validation function
+&ui_print_header(undef, $text{'twofactor_title'}, "");
+
+print &text('twofactor_testing', $prov->[1]),"<br>\n";
+my $func = "webmin::validate_twofactor_".$user->{'twofactor_provider'};
+my $err = &{\&{$func}}($user->{'twofactor_id'}, $in{'test'},
+		       $user->{'twofactor_apikey'});
+if ($err) {
+	print &text('twofactor_testfailed', $err),"<p>\n";
+
+	print &ui_form_start("save_twofactor.cgi");
+	print &ui_hidden("user", $in{'user'}) if ($in{'user'});
+	print &ui_form_end([ [ "disable", $text{'twofactor_testdis'} ] ]);
+	}
+else {
+	print $text{'twofactor_testok'},"<p>\n";
+	}
+
+&ui_print_footer("", $text{'index_return'});
--- a/acl/twofactor.pl
+++ b/acl/twofactor.pl
@@ -1,6 +1,10 @@
 #!/usr/local/bin/perl
 # Validate the OTP for some user

+use strict;
+use warnings;
+no warnings 'once';
+our $module_name;
 $main::no_acl_check = 1;
 $main::no_referers_check = 1;
 $ENV{'WEBMIN_CONFIG'} = "/etc/webmin";
@@ -8,17 +12,19 @@ $ENV{'WEBMIN_VAR'} = "/var/webmin";
 if ($0 =~ /^(.*\/)[^\/]+$/) {
        chdir($1);
        }
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 $module_name eq 'acl' || die "Command must be run with full path";

 # Check command-line args
@ARGV == 5 || die "Usage: $0 user provider id token api-key";
-($user, $provider, $id, $token, $apikey) = @ARGV;
+my ($user, $provider, $id, $token, $apikey) = @ARGV;

 # Call the provider validation function
 &foreign_require("webmin");
-$func = "webmin::validate_twofactor_".$provider;
-$err = &$func($id, $token, $apikey);
+my $method = "validate_twofactor_".$provider;
+my $code = webmin->can($method)
+	or die "Unknown twofactor provider: $provider\n";
+my $err = $code->($id, $token, $apikey);
 if ($err) {
 	$err =~ s/\r|\n/ /g;
 	print $err,"\n";
--- a/acl/twofactor_form.cgi
+++ b/acl/twofactor_form.cgi
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
-require './acl-lib.pl';
+require './acl-lib.pl';    ## no critic
 our (%in, %text, %config, %access, $base_remote_user);
 &foreign_require("webmin");
 &error_setup($text{'twofactor_err'});
--- a/acl_security.pl
+++ b/acl_security.pl
@@ -16,7 +16,7 @@ print &ui_table_row($text{'acl_root'},
 # Other dirs to allow
 print &ui_table_row($text{'acl_otherdirs'},
 	&ui_textarea("otherdirs", join("\n", split(/\t+/, $o->{'otherdirs'})),
-		     5, 40), 3);
+		     3, 40), 3);

 # Can see dot files?
 print &ui_table_row($text{'acl_nodot'},
@@ -77,18 +77,6 @@ print &ui_table_row($text{'acl_gedit'},

 print &ui_table_hr();

-# Can submit feedback?
-print &ui_table_row($text{'acl_feedback'},
-	&ui_radio("feedback", int($o->{'feedback'}),
-	  	  [ map { [ $_, $text{'acl_feedback'.$_} ] } (2,3,1,0) ]));
-
-# Can accept RPC calls?
-print &ui_table_row($text{'acl_rpc'},
-	&ui_radio("rpc", int($o->{'rpc'}),
-		  [ [ 1, $text{'acl_rpc1'} ],
-		    $o->{'rpc'} == 2 ? ( [ 2, $text{'acl_rpc2'} ] ) : ( ),
-		    [ 0, $text{'acl_rpc0'} ] ]));
-
 # Get new permissions?
 print &ui_table_row($text{'acl_negative'},
 	&ui_radio("negative", int($o->{'negative'}),
@@ -110,27 +98,26 @@ print &ui_table_row($text{'acl_webminsearch'},
 # Parse the form for global security options
 sub acl_security_save
 {
-$_[0]->{'root'} = $in{'root_def'} ? undef : $in{'root'};
-$_[0]->{'otherdirs'} = join("\t", split(/\r?\n/, $in{'otherdirs'}));
-$_[0]->{'nodot'} = $in{'nodot'};
+my ($o) = @_;
+$o->{'root'} = $in{'root_def'} ? undef : $in{'root'};
+$o->{'otherdirs'} = join("\t", split(/\r?\n/, $in{'otherdirs'}));
+$o->{'nodot'} = $in{'nodot'};

-$_[0]->{'uedit_mode'} = $in{'uedit_mode'};
-$_[0]->{'uedit'} = $in{'uedit_mode'} == 2 ? $in{'uedit_can'} :
+$o->{'uedit_mode'} = $in{'uedit_mode'};
+$o->{'uedit'} = $in{'uedit_mode'} == 2 ? $in{'uedit_can'} :
 		   $in{'uedit_mode'} == 3 ? $in{'uedit_cannot'} :
 		   $in{'uedit_mode'} == 4 ? $in{'uedit_uid'} :
 		   $in{'uedit_mode'} == 5 ? getgrnam($in{'uedit_group'}) : "";
-$_[0]->{'uedit2'} = $in{'uedit_mode'} == 4 ? $in{'uedit_uid2'} : undef;
+$o->{'uedit2'} = $in{'uedit_mode'} == 4 ? $in{'uedit_uid2'} : undef;

-$_[0]->{'gedit_mode'} = $in{'gedit_mode'};
-$_[0]->{'gedit'} = $in{'gedit_mode'} == 2 ? $in{'gedit_can'} :
+$o->{'gedit_mode'} = $in{'gedit_mode'};
+$o->{'gedit'} = $in{'gedit_mode'} == 2 ? $in{'gedit_can'} :
 		   $in{'gedit_mode'} == 3 ? $in{'gedit_cannot'} :
 		   $in{'gedit_mode'} == 4 ? $in{'gedit_gid'} : "";
-$_[0]->{'gedit2'} = $in{'gedit_mode'} == 4 ? $in{'gedit_gid2'} : undef;
-$_[0]->{'feedback'} = $in{'feedback'};
-$_[0]->{'rpc'} = $in{'rpc'};
-$_[0]->{'negative'} = $in{'negative'};
-$_[0]->{'readonly'} = $in{'readonly'};
-$_[0]->{'fileunix'} = $in{'fileunix_def'} ? undef : $in{'fileunix'};
-$_[0]->{'webminsearch'} = $in{'webminsearch'};
+$o->{'gedit2'} = $in{'gedit_mode'} == 4 ? $in{'gedit_gid2'} : undef;
+$o->{'negative'} = $in{'negative'};
+$o->{'readonly'} = $in{'readonly'};
+$o->{'fileunix'} = $in{'fileunix_def'} ? undef : $in{'fileunix'};
+$o->{'webminsearch'} = $in{'webminsearch'};
 }

--- a/apache/acl_security.pl
+++ b/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";
-print "<td rowspan=4 valign=top>\n";
-printf "<input type=radio name=virts_def value=1 %s> %s\n",
-	$_[0]->{'virts'} eq '*' ? 'checked' : '', $text{'acl_vall'};
-printf "<input type=radio name=virts_def value=0 %s> %s<br>\n",
-	$_[0]->{'virts'} eq '*' ? '' : 'checked', $text{'acl_vsel'};
-print "<select name=virts multiple size=5>\n";
-local $conf = &get_config();
-local @virts = ( { 'value' => '__default__' },
-		 &find_directive_struct("VirtualHost", $conf) );
-local %vcan = map { $_, 1 } split(/\s+/, $_[0]->{'virts'});
-local $v;
-foreach $v (@virts) {
-	local @vn = &virt_acl_name($v);
-	local ($can) = grep { $vcan{$_} } @vn;
-	local $vn = $can || $vn[0];
-	printf "<option value=\"%s\" %s>%s</option>\n",
-		$vn, $can ? "selected" : "",
-		$vn eq "__default__" ? $text{'acl_defserv'} : $vn;
+my ($o) = @_;
+
+my $conf = &get_config();
+my @virts = ( { 'value' => '__default__' },
+	      &find_directive_struct("VirtualHost", $conf) );
+my @vsel = $o->{'virts'} eq '*' ? () : split(/\s+/, $o->{'virts'});
+my %vcan = map { $_, 1 } @vsel;
+my @vopts;
+foreach my $v (@virts) {
+	my @vn = &virt_acl_name($v);
+	my ($can) = grep { $vcan{$_} } @vn;
+	my $show = $can || $vn[0];
+	push(@vopts, [ $show,
+		       $show eq "__default__" ? $text{'acl_defserv'}
+					      : $show ]);
 	delete($vcan{$can}) if ($can);
 	}
-foreach $vn (keys %vcan) {
-	next if ($vn eq "*");
-	printf "<option value=\"%s\" %s>%s</option>\n",
-		$vn, "selected",
-		$vn eq "__default__" ? $text{'acl_defserv'} : $vn;
+print &ui_table_row($text{'acl_virts'},
+	&ui_radio("virts_def", $o->{'virts'} eq '*' ? 1 : 0,
+		  [ [ 1, $text{'acl_vall'} ],
+		    [ 0, $text{'acl_vsel'} ] ])."<br>\n".
+	&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";
-printf "<option value=1 %s>$text{'yes'}</option>\n",
-	$_[0]->{'global'} == 1 ? "selected" : "";
-printf "<option value=2 %s>$text{'acl_htaccess'}</option>\n",
-	$_[0]->{'global'} == 2 ? "selected" : "";
-printf "<option value=0 %s>$text{'no'}</option></select></td> </tr>\n",
-	$_[0]->{'global'} == 0 ? "selected" : "";
-
-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";
+print &ui_table_row($text{'acl_dirs'},
+	&ui_radio("dirsmode", $o->{'dirsmode'},
+		  [ [ 0, $text{'acl_dirs0'} ],
+		    [ 1, $text{'acl_dirs1'} ],
+		    [ 2, $text{'acl_dirs2'} ] ])."<br>\n".
+	&ui_textarea("dirs", join("\n", split(/\s+/, $o->{'dirs'})), 5, 50),
+	3);
 }

 # acl_security_save(&options)
@@ -141,4 +110,3 @@ $_[0]->{'names'} = $in{'names'};
 $_[0]->{'dirsmode'} = $in{'dirsmode'};
 $_[0]->{'dirs'} = join(" ", split(/\s+/, $in{'dirs'}));
 }
-
--- a/apache/allmanual_save.cgi
+++ b/apache/allmanual_save.cgi
@@ -12,7 +12,7 @@ $conf = &get_config();
 &indexof($in{'file'}, @files) >= 0 || &error($text{'manual_efile'});

 $temp = &transname();
-&execute_command("cp ".quotemeta($in{'file'})." $temp");
+&execute_command("cp ".quotemeta($in{'file'})." ".quotemeta($temp));
 $in{'data'} =~ s/\r//g;
 &lock_file($in{'file'});
 &open_tempfile(FILE, ">$in{'file'}");
@@ -22,7 +22,7 @@ $in{'data'} =~ s/\r//g;
 if ($config{'test_manual'}) {
 	$err = &test_config();
 	if ($err) {
-		&execute_command("mv $temp '$in{'file'}'");
+		&execute_command("mv ".quotemeta($temp)." ".quotemeta($in{'file'}));
 		&error(&text('manual_etest', "<pre>$err</pre>"));
 		}
 	}
@@ -30,4 +30,3 @@ unlink($temp);
 &format_config_file($in{'file'});
 &webmin_log("manual", undef, undef, { 'file' => $in{'file'} });
 &redirect("index.cgi?mode=global");
-
--- a/apache/apache-lib.pl
+++ b/apache/apache-lib.pl
@@ -26,82 +26,94 @@ $last_restart_time_flag = $module_var_directory."/restart-flag";
 # if the Apache binary changes, when Webmin is upgraded, or once every five
 # minutes if automatic rebuilding is enabled.
 if ($module_name ne 'htaccess') {
-	local %oldsite;
-	local $httpd = &find_httpd();
-	local @st = stat($httpd);
-	&read_file($site_file, \%oldsite);
-	local @sst = stat($site_file);
-	if ($oldsite{'path'} ne $httpd ||
-	    $oldsite{'size'} != $st[7] ||
-	    $oldsite{'webmin'} != &get_webmin_version() ||
-	    $config{'auto_mods'} && $sst[9] < time()-5*60) {
-		# Need to build list of supported modules
-		local ($ver, $mods, $fullver) = &httpd_info($httpd);
-		if ($ver) {
-			my @allmods = &available_modules();
-			local @mods = map { "$_/$ver" }
-				          &configurable_modules(\@allmods);
-			foreach my $m (@mods) {
-				if ($m =~ /(\S+)\/(\S+)/) {
-					$httpd_modules{$1} = $2;
-					}
-				}
-			# Call again now that known modules have been set, as
-			# sometimes there are dependencies due to LoadModule
-			# statements in an IfModule block
-			undef(@get_config_cache);
-			@allmods = &available_modules();
-			@mods = map { "$_/$ver" }
-				    &configurable_modules(\@allmods);
-			local %site = ( 'size' => $st[7],
-					'path' => $httpd,
-					'modules' => join(' ', @mods),
-					'allmodules' => join(' ', @allmods),
-					'version' => $ver,
-					'fullversion' => $fullver,
-					'webmin' => &get_webmin_version() );
-			&lock_file($site_file);
-			&write_file($site_file, \%site);
-			chmod(0644, $site_file);
-			&unlock_file($site_file);
-			}
-		}
-	}
-
-# Read the site-specific setup file, then require in all the module-specific
-# .pl files
-if (&read_file($site_file, \%site)) {
-	local($m, $f, $d);
-	$httpd_size = $site{'size'};
-	foreach $m (split(/\s+/, $site{'modules'})) {
-		if ($m =~ /(\S+)\/(\S+)/) {
-			$httpd_modules{$1} = $2;
-			}
-		}
-	foreach $m (split(/\s+/, $site{'allmodules'})) {
-		$all_httpd_modules{$m} = $site{'version'};
-		}
-	foreach $m (keys %httpd_modules) {
-		if (!-r "$module_root_directory/$m.pl") {
-			delete($httpd_modules{$m});
-			}
-		}
-	foreach $f (split(/\s+/, $site{'htaccess'})) {
-		if (-r $f) { push(@htaccess_files, $f); }
-		}
-	foreach $m (keys %httpd_modules) {
-		do "$m.pl";
-		}
-	foreach $d (split(/\s+/, $site{'defines'})) {
-		$httpd_defines{$d}++;
-		}
+	&create_site_file();
 	}
+&read_site_file();

 $apache_docbase = $config{'apache_docbase'} ? $config{'apache_docbase'} :
 		  $httpd_modules{'core'} >= 2.0 ?
 			"http://httpd.apache.org/docs-2.0/mod/" :
 			"http://httpd.apache.org/docs/mod/";

+# create_site_file()
+# If the Apache binary or Webmin version has changed, create the site
+# file containing all known Apache modules
+sub create_site_file
+{
+my %oldsite;
+my $httpd = &find_httpd();
+my @st = stat($httpd);
+&read_file($site_file, \%oldsite);
+my @sst = stat($site_file);
+if ($oldsite{'path'} ne $httpd ||
+    $oldsite{'size'} != $st[7] ||
+    $oldsite{'webmin'} != &get_webmin_version() ||
+    $config{'auto_mods'} && $sst[9] < time()-5*60) {
+	# Need to build list of supported modules
+	my ($ver, $mods, $fullver) = &httpd_info($httpd);
+	if ($ver) {
+		my @allmods = &available_modules();
+		my @mods = map { "$_/$ver" }
+			       &configurable_modules(\@allmods);
+		foreach my $m (@mods) {
+			if ($m =~ /(\S+)\/(\S+)/) {
+				$httpd_modules{$1} = $2;
+				}
+			}
+		# Call again now that known modules have been set, as
+		# sometimes there are dependencies due to LoadModule
+		# statements in an IfModule block
+		undef(@get_config_cache);
+		@allmods = &available_modules();
+		@mods = map { "$_/$ver" }
+			    &configurable_modules(\@allmods);
+		my %site = ( 'size' => $st[7],
+			     'path' => $httpd,
+			     'modules' => join(' ', @mods),
+			     'allmodules' => join(' ', @allmods),
+			     'version' => $ver,
+			     'fullversion' => $fullver,
+			     'webmin' => &get_webmin_version() );
+		&lock_file($site_file);
+		&write_file($site_file, \%site);
+		chmod(0644, $site_file);
+		&unlock_file($site_file);
+		}
+	}
+}
+
+# read_site_file()
+# Read the site-specific setup file, then require in all the module-specific
+# .pl files
+sub read_site_file
+{
+if (&read_file($site_file, \%site)) {
+	foreach my $m (split(/\s+/, $site{'modules'})) {
+		if ($m =~ /(\S+)\/(\S+)/) {
+			$httpd_modules{$1} = $2;
+			}
+		}
+	foreach my $m (split(/\s+/, $site{'allmodules'})) {
+		$all_httpd_modules{$m} = $site{'version'};
+		}
+	foreach my $m (keys %httpd_modules) {
+		if (!-r "$module_root_directory/$m.pl") {
+			delete($httpd_modules{$m});
+			}
+		}
+	foreach my $f (split(/\s+/, $site{'htaccess'})) {
+		if (-r $f) { push(@htaccess_files, $f); }
+		}
+	foreach my $m (keys %httpd_modules) {
+		do "$m.pl";
+		}
+	foreach my $d (split(/\s+/, $site{'defines'})) {
+		$httpd_defines{$d}++;
+		}
+	}
+
+}
+
 # parse_config_file(handle, lines, file, [recursive])
 # Parses lines of text from some config file into a data structure. The
 # return value is an array of references, one for each directive in the file.
@@ -424,6 +436,13 @@ foreach $v (@virt) {
 return \@get_config_cache;
 }

+# flush_config_cache()
+# Delete all in-memory config caches
+sub flush_config_cache
+{
+undef(@get_config_cache);
+}
+
 # get_config_file(filename, [&seen-files])
 # Returns a list of config hash refs from some file
 sub get_config_file
@@ -776,6 +795,428 @@ unlink($file);
 &delete_webfile_link($file);
 }

+# can_manage_vhost_files()
+# Returns 1 if this system uses Debian-style available/enabled site dirs
+sub can_manage_vhost_files
+{
+return 0 if ($gconfig{'os_type'} ne 'debian-linux');
+my $avail = &vhost_available_dir();
+my $enabled = &vhost_enabled_dir();
+return $avail && -d $avail && $enabled && -d $enabled &&
+       &simplify_path(&resolve_links($avail)) ne
+       &simplify_path(&resolve_links($enabled));
+}
+
+# vhost_available_dir()
+# Returns the configured directory of available Apache virtual host files
+sub vhost_available_dir
+{
+return $config{'virt_file'} ? &server_root($config{'virt_file'}) : undef;
+}
+
+# vhost_enabled_dir()
+# Returns the configured directory of enabled Apache virtual host symlinks
+sub vhost_enabled_dir
+{
+return $config{'link_dir'} ? &server_root($config{'link_dir'}) : undef;
+}
+
+# get_vhost_available_files()
+# Returns real config files from the directory used for new virtual hosts
+sub get_vhost_available_files
+{
+my @rv;
+return @rv if (!&can_manage_vhost_files());
+my $avail = &vhost_available_dir();
+opendir(AVAIL, $avail) || return @rv;
+foreach my $f (sort { lc($a) cmp lc($b) } readdir(AVAIL)) {
+	next if ($f eq "." || $f eq "..");
+	my $file = $avail."/".$f;
+	my $rfile = &simplify_path(&resolve_links($file));
+	next if (!$rfile || !-f $rfile || !-r $rfile);
+	push(@rv, $rfile);
+	}
+closedir(AVAIL);
+return &unique(@rv);
+}
+
+# find_virtuals_in_file(file)
+# Returns VirtualHost blocks parsed from one config file
+sub find_virtuals_in_file
+{
+my ($file) = @_;
+my $rfile = &simplify_path(&resolve_links($file));
+$rfile ||= $file;
+return ( ) if (!-r $rfile);
+my @conf = &get_config_file($rfile);
+return grep { $_->{'file'} eq $rfile }
+       &find_directive_struct("VirtualHost", \@conf);
+}
+
+# is_default_vhost(&virt)
+# Returns 1 if a VirtualHost looks like a default/catch-all host
+sub is_default_vhost
+{
+my ($virt) = @_;
+return 1 if (!$virt);
+return 1 if ($virt->{'value'} =~ /_default_/i);
+return 1 if (!&find_directive("ServerName", $virt->{'members'}));
+return 0;
+}
+
+# can_manage_vhost_file(file)
+# Returns 1 if all virtual hosts in a file are manageable by this user
+sub can_manage_vhost_file
+{
+my ($file) = @_;
+my $rfile = &simplify_path(&resolve_links($file));
+$rfile ||= $file;
+return 0 if (!$rfile || !-f $rfile || !-r $rfile);
+my @virts = &find_virtuals_in_file($rfile);
+return 0 if (!@virts);
+foreach my $virt (@virts) {
+	return 0 if (&is_default_vhost($virt));
+	return 0 if (!&can_edit_virt($virt));
+	}
+return 1;
+}
+
+# can_manage_vhost_state_file(file)
+# Returns 1 if a virtual host file can have its enabled state managed here
+sub can_manage_vhost_state_file
+{
+my ($file) = @_;
+my $rfile = &simplify_path(&resolve_links($file));
+$rfile ||= $file;
+return 0 if (!$rfile || !-f $rfile);
+my %available = map { $_, 1 } &get_vhost_available_files();
+return 0 if (!$available{$rfile});
+return &can_manage_vhost_file($rfile);
+}
+
+# get_virtual_list_rows(&config)
+# Returns row hashes for the virtual-host list, preserving sites-available order
+sub get_virtual_list_rows
+{
+my ($conf) = @_;
+my @active = grep { &can_edit_virt($_) }
+	     &find_directive_struct("VirtualHost", $conf);
+if (&can_manage_vhost_files()) {
+	my @rows;
+	my %active_by_file;
+	foreach my $v (@active) {
+		my $file = &simplify_path(&resolve_links($v->{'file'}));
+		$file ||= $v->{'file'};
+		push(@{$active_by_file{$file}}, $v);
+		}
+	my %done_virt;
+	foreach my $file (&get_vhost_available_files()) {
+		my @filevirts = @{$active_by_file{$file} || [ ]};
+		my $active = @filevirts ? 1 : 0;
+		if (!@filevirts) {
+			@filevirts = grep { &can_edit_virt($_) &&
+					     !&is_default_vhost($_) }
+				     &find_virtuals_in_file($file);
+			}
+		foreach my $v (@filevirts) {
+			push(@rows, { 'virt' => $v,
+				      'active' => $active,
+				      'file' => $file });
+			$done_virt{$v}++;
+			}
+		}
+	foreach my $v (@active) {
+		next if ($done_virt{$v});
+		push(@rows, { 'virt' => $v,
+			      'active' => 1,
+			      'file' => $v->{'file'} });
+		}
+	return @rows;
+	}
+return map { { 'virt' => $_, 'active' => 1, 'file' => $_->{'file'} } }
+       @active;
+}
+
+# vhost_file_link(file)
+# Returns the enabled symlink path for a virtual host file
+sub vhost_file_link
+{
+my ($file) = @_;
+return undef if (!&can_manage_vhost_files());
+my $rfile = &simplify_path(&resolve_links($file));
+$rfile ||= $file;
+my $avail = &vhost_available_dir();
+my $short;
+if (opendir(AVAIL, $avail)) {
+	foreach my $f (sort { lc($a) cmp lc($b) } readdir(AVAIL)) {
+		next if ($f eq "." || $f eq "..");
+		my $afile = $avail."/".$f;
+		my $rafile = &simplify_path(&resolve_links($afile));
+		if ($rafile && $rafile eq $rfile) {
+			$short = $f;
+			last;
+			}
+		}
+	closedir(AVAIL);
+	}
+$short ||= $rfile;
+$short =~ s/^.*\///;
+return &vhost_enabled_dir()."/".$short;
+}
+
+# vhost_file_links(file)
+# Returns enabled symlinks for a virtual host file
+sub vhost_file_links
+{
+my ($file) = @_;
+my @rv;
+return @rv if (!&can_manage_vhost_files());
+my $rfile = &simplify_path(&resolve_links($file));
+$rfile ||= $file;
+my $enabled = &vhost_enabled_dir();
+opendir(LINKDIR, $enabled) || return @rv;
+foreach my $f (readdir(LINKDIR)) {
+	next if ($f eq "." || $f eq "..");
+	my $link = $enabled."/".$f;
+	next if (!-l $link);
+	my $rlink = &simplify_path(&resolve_links($link));
+	if ($rlink && $rlink eq $rfile) {
+		push(@rv, $link);
+		}
+	}
+closedir(LINKDIR);
+return @rv;
+}
+
+# vhost_file_enabled(file)
+# Returns 1 if a virtual host file has an enabled symlink
+sub vhost_file_enabled
+{
+my ($file) = @_;
+return scalar(&vhost_file_links($file)) ? 1 : 0;
+}
+
+# enable_vhost_file(file)
+# Enables a virtual host file and rolls back if apache configtest fails
+sub enable_vhost_file
+{
+my ($file) = @_;
+my $rfile = &simplify_path(&resolve_links($file));
+$rfile ||= $file;
+return $text{'enable_efile'} if (!&can_manage_vhost_state_file($rfile));
+my $verr = &virtualmin_vhost_file_state_error($rfile, "enable");
+return $verr if ($verr);
+my $link = &vhost_file_link($rfile);
+$link || return $text{'enable_elinkdir'};
+return undef if (&vhost_file_enabled($rfile));
+if (-e $link || -l $link) {
+	return &text('enable_elinkexists', "<tt>".&html_escape($link)."</tt>");
+	}
+&symlink_logged($rfile, $link) ||
+	return &text('enable_elink', "<tt>".&html_escape($link)."</tt>",
+		     "<tt>".&html_escape($!)."</tt>");
+my $err = &test_config();
+if ($err) {
+	&unlink_logged($link);
+	return &text('enable_etest', "<tt>".&html_escape($err)."</tt>");
+	}
+&flush_config_cache();
+&update_last_config_change();
+return undef;
+}
+
+# disable_vhost_file(file)
+# Disables a virtual host file and rolls back if apache configtest fails
+sub disable_vhost_file
+{
+my ($file) = @_;
+my $rfile = &simplify_path(&resolve_links($file));
+$rfile ||= $file;
+return $text{'enable_efile'} if (!&can_manage_vhost_state_file($rfile));
+my $verr = &virtualmin_vhost_file_state_error($rfile, "disable");
+return $verr if ($verr);
+my @links = &vhost_file_links($file);
+return undef if (!@links);
+my @restore = map { [ $_, readlink($_) ] } @links;
+my @removed;
+foreach my $link (@links) {
+	if (!&unlink_logged($link)) {
+		foreach my $r (@removed) {
+			&symlink_logged($r->[1], $r->[0])
+				if (defined($r->[1]) && !-e $r->[0] && !-l $r->[0]);
+			}
+		return &text('enable_eunlink',
+			     "<tt>".&html_escape($link)."</tt>",
+			     "<tt>".&html_escape($!)."</tt>");
+		}
+	my ($restore) = grep { $_->[0] eq $link } @restore;
+	push(@removed, $restore) if ($restore);
+	}
+my $err = &test_config();
+if ($err) {
+	foreach my $r (@restore) {
+		&symlink_logged($r->[1], $r->[0])
+			if (defined($r->[1]) && !-e $r->[0] && !-l $r->[0]);
+		}
+	return &text('enable_etest', "<tt>".&html_escape($err)."</tt>");
+	}
+&flush_config_cache();
+&update_last_config_change();
+return undef;
+}
+
+# virtualmin_available()
+# Returns 1 if Virtualmin is installed and supported on this system
+sub virtualmin_available
+{
+return $main::apache_virtualmin_available
+	if (defined($main::apache_virtualmin_available));
+$main::apache_virtualmin_available = &foreign_check("virtual-server");
+return $main::apache_virtualmin_available;
+}
+
+# virtualmin_domain_by_name(name)
+# Returns a Virtualmin domain object by domain name, if one exists
+sub virtualmin_domain_by_name
+{
+my ($name) = @_;
+return undef if (!&virtualmin_available());
+return $main::apache_virtualmin_domain_by_name_cache{$name}
+	if (exists($main::apache_virtualmin_domain_by_name_cache{$name}));
+&foreign_require("virtual-server");
+my $d = &virtual_server::get_domain_by("dom", $name);
+$main::apache_virtualmin_domain_by_name_cache{$name} = $d;
+return $d;
+}
+
+# virtual_names(&virt)
+# Returns all hostnames from ServerName and ServerAlias directives
+sub virtual_names
+{
+my ($virt) = @_;
+my @rv;
+my $sn = &find_directive("ServerName", $virt->{'members'});
+push(@rv, $sn) if ($sn);
+foreach my $sa (&find_directive_struct("ServerAlias", $virt->{'members'})) {
+	push(@rv, @{$sa->{'words'} || [ ]});
+	if (!@{$sa->{'words'} || [ ]} && $sa->{'value'}) {
+		push(@rv, $sa->{'value'});
+		}
+	}
+return grep { $_ && $_ ne "*" } &unique(@rv);
+}
+
+# virtualmin_domain_for_vhost_file(file)
+# Returns the Virtualmin domain object for a virtual host file, if any
+sub virtualmin_domain_for_vhost_file
+{
+my ($file) = @_;
+return undef if (!&virtualmin_available());
+my $rfile = &simplify_path(&resolve_links($file));
+$rfile ||= $file;
+return $main::apache_virtualmin_domain_for_file_cache{$rfile}
+	if (exists($main::apache_virtualmin_domain_for_file_cache{$rfile}));
+foreach my $virt (&find_virtuals_in_file($file)) {
+	next if (!&can_edit_virt($virt));
+	foreach my $name (&virtual_names($virt)) {
+		my $d = &virtualmin_domain_by_name($name);
+		if (!$d && $name =~ /^www\.(\S+)/i) {
+			$d = &virtualmin_domain_by_name($1);
+			}
+		if ($d) {
+			$main::apache_virtualmin_domain_for_file_cache{$rfile} = $d;
+			return $d;
+			}
+		}
+	}
+$main::apache_virtualmin_domain_for_file_cache{$rfile} = undef;
+return undef;
+}
+
+# vhost_file_state(file)
+# Returns the effective enabled state for a virtual host file
+sub vhost_file_state
+{
+my ($file) = @_;
+my $d = &virtualmin_domain_for_vhost_file($file);
+if ($d) {
+	return { 'enabled' => $d->{'disabled'} ? 0 : 1,
+		 'source' => 'virtualmin',
+		 'domain' => $d };
+	}
+return { 'enabled' => &vhost_file_enabled($file) ? 1 : 0,
+	 'source' => 'apache' };
+}
+
+# vhost_file_toggle_action(file)
+# Returns the action needed to toggle a virtual host file's effective state
+sub vhost_file_toggle_action
+{
+my ($file) = @_;
+return &vhost_file_state($file)->{'enabled'} ? "disable" : "enable";
+}
+
+# virtualmin_domain_state_link(&domain, enabled?)
+# Returns a link to the Virtualmin state change form for some domain
+sub virtualmin_domain_state_link
+{
+my ($d, $enabled) = @_;
+my $page = $enabled ? "disable_domain.cgi" : "enable_domain.cgi";
+my $label = $enabled ? $text{'enable_virtualmin_disable_label'} :
+		       $text{'enable_virtualmin_enable_label'};
+my $url = "../virtual-server/".$page."?dom=".&urlize($d->{'id'});
+return &ui_link(&quote_escape($url), "\"".$label."\"");
+}
+
+# virtualmin_vhost_file_state_error(file, action)
+# Returns an error if a Virtualmin-owned site is being enabled or disabled here
+sub virtualmin_vhost_file_state_error
+{
+my ($file, $action) = @_;
+return undef if ($action ne "enable" && $action ne "disable");
+my $state_info = &vhost_file_state($file);
+return undef if ($state_info->{'source'} ne "virtualmin");
+my $d = $state_info->{'domain'};
+return undef if (!$d);
+my $state = lc($state_info->{'enabled'} ? $text{'index_enabled'} :
+					  $text{'index_disabled'});
+my $dom = "<tt>".&html_escape($d->{'dom'})."</tt>";
+my $link = &virtualmin_domain_state_link($d, $state_info->{'enabled'});
+return $state_info->{'enabled'} ?
+	&text('enable_evirtualmin_disable', $dom, $state, $link) :
+	&text('enable_evirtualmin_enable', $dom, $state, $link);
+}
+
+# delete_virtuals_from_file(file, &virtualhosts...)
+# Deletes VirtualHost blocks from one file and removes the file if empty
+sub delete_virtuals_from_file
+{
+my ($file, @virts) = @_;
+return 0 if (!@virts);
+my $lref = &read_file_lines($file);
+foreach my $virt (sort { $b->{'line'} <=> $a->{'line'} } @virts) {
+	my $len = $virt->{'eline'} - $virt->{'line'} + 1;
+	splice(@$lref, $virt->{'line'}, $len);
+	}
+my $empty = 1;
+foreach my $line (@$lref) {
+	if ($line =~ /\S/) {
+		$empty = 0;
+		last;
+		}
+	}
+&flush_file_lines($file);
+if ($empty) {
+	foreach my $link (&vhost_file_links($file)) {
+		&unlink_logged($link);
+		}
+	&unlink_logged($file);
+	}
+&flush_config_cache();
+&update_last_config_change();
+return scalar(@virts);
+}
+
 # renumber(&config, line, file, offset)
 # Recursively changes the line number of all directives from some file 
 # beyond the given line.
@@ -800,9 +1241,16 @@ foreach my $d (@$conf) {
 # Convert a relative path to being under the server root
 sub server_root
 {
-if (!$_[0]) { return undef; }
-elsif ($_[0] =~ /^\//) { return $_[0]; }
-else { return "$config{'httpd_dir'}/$_[0]"; }
+my ($path) = @_;
+if (!$path) {
+	return undef;
+	}
+elsif ($path =~ /^\//) {
+	return $path;
+	}
+else {
+	return "$config{'httpd_dir'}/$path";
+	}
 }

 sub dump_config
@@ -1223,6 +1671,9 @@ sub restart_button
 local $args = "redir=".&urlize(&this_url());
 local @rv;
 if (&is_apache_running()) {
+	if ($access{'stop'}) {
+		push(@rv, &ui_link("stop.cgi?$args", $text{'apache_stop'}) );
+		}
 	if ($access{'apply'}) {
 		my $n = &needs_config_restart();
 		if ($n) {
@@ -1233,9 +1684,6 @@ if (&is_apache_running()) {
 			push(@rv, &ui_link("restart.cgi?$args", $text{'apache_apply'}) );
 			}
 		}
-	if ($access{'stop'}) {
-		push(@rv, &ui_link("stop.cgi?$args", $text{'apache_stop'}) );
-		}
 	}
 elsif ($access{'stop'}) {
 	push(@rv, &ui_link("start.cgi?$args", $text{'apache_start'}) );
@@ -1420,7 +1868,7 @@ sub allowed_auth_file
 local $_;
 return 1 if ($access{'dir'} eq '/');
 return 0 if ($_[0] =~ /\.\./);
-local $f = &server_root($_[0], &get_config());
+local $f = &server_root($_[0]);
 return 0 if (-l $f && !&allowed_auth_file(readlink($f)));
 local $l = length($access{'dir'});
 return length($f) >= $l && substr($f, 0, $l) eq $access{'dir'};
@@ -1430,7 +1878,7 @@ return length($f) >= $l && substr($f, 0, $l) eq $access{'dir'};
 # Returns 1 if the directory in some path exists
 sub directory_exists
 {
-local $path = &server_root($_[0], &get_config());
+local $path = &server_root($_[0]);
 if ($path =~ /^(\S*\/)([^\/]+)$/) {
 	return -d $1;
 	}
@@ -1525,9 +1973,10 @@ return undef;
 # if necessary.
 sub before_changing
 {
+my @extra = grep { $_ } @_;
 if ($config{'test_always'} || $access{'test_always'}) {
 	local $conf = &get_config();
-	local @files = &unique(map { $_->{'file'} } @$conf);
+	local @files = &unique((map { $_->{'file'} } @$conf), @extra);
 	local $/ = undef;
 	local $f;
 	foreach $f (@files) {
@@ -1606,7 +2055,7 @@ local $conf = &get_config();
 local $pidfilestr = &find_directive_struct("PidFile", $conf);
 local $pidfile = $pidfilestr ? $pidfilestr->{'words'}->[0]
 		       	     : "logs/httpd.pid";
-return &server_root($pidfile, $conf);
+return &server_root($pidfile);
 }

 # restart_apache()
@@ -1791,8 +2240,8 @@ if (!&is_apache_running()) {
 		return $text{'start_eunknown'};
 		}
 	else {
-		$errorlog = &server_root($errorlog, $conf);
-		$out = `tail -5 $errorlog`;
+		$errorlog = &server_root($errorlog);
+		$out = &backquote_command("tail -5 ".quotemeta($errorlog));
 		return "$text{'start_eafter'} : <pre>$out</pre>";
 		}
 	}
@@ -1808,7 +2257,7 @@ local $conf = &get_config();
 local $errorlogstr = &find_directive_struct("ErrorLog", $conf);
 local $errorlog = $errorlogstr ? $errorlogstr->{'words'}->[0]
 			       : "logs/error_log";
-$errorlog = &server_root($errorlog, $conf);
+$errorlog = &server_root($errorlog);
 return $errorlog;
 }

@@ -1950,10 +2399,11 @@ return @rv;
 sub create_webfile_link
 {
 local ($file) = @_;
-if ($config{'link_dir'}) {
+my $linkdir = &vhost_enabled_dir();
+if ($linkdir) {
 	local $short = $file;
 	$short =~ s/^.*\///;
-	local $linksrc = "$config{'link_dir'}/$short";
+	local $linksrc = "$linkdir/$short";
 	&lock_file($linksrc);
 	symlink($file, $linksrc);
 	&unlock_file($linksrc);
@@ -1966,16 +2416,16 @@ if ($config{'link_dir'}) {
 sub delete_webfile_link
 {
 local ($file) = @_;
-if ($config{'link_dir'}) {
-	local $short = $file;
-	$short =~ s/^.*\///;
-	opendir(LINKDIR, $config{'link_dir'});
+$file = &simplify_path(&resolve_links($file));
+my $linkdir = &vhost_enabled_dir();
+if ($linkdir && opendir(LINKDIR, $linkdir)) {
 	foreach my $f (readdir(LINKDIR)) {
-		if ($f ne "." && $f ne ".." &&
-		    (&simplify_path(
-		       &resolve_links($config{'link_dir'}."/".$f)) eq $file ||
-		     $short eq $f)) {
-			&unlink_logged($config{'link_dir'}."/".$f);
+		if ($f ne "." && $f ne "..") {
+			my $link = $linkdir."/".$f;
+			next if (!-l $link);
+			if (&simplify_path(&resolve_links($link)) eq $file) {
+				&unlink_logged($link);
+				}
 			}
 		}
 	closedir(LINKDIR);
@@ -2274,5 +2724,14 @@ sub format_config_allowed
 return $config{'format_config'};
 }

-1;
+# clear_apache_modules_cache()
+# If new Apache modules were enabled, force re-gen of the site file
+# that contains the modules cache
+sub clear_apache_modules_cache
+{
+&unlink_file($site_file);
+&create_site_file();
+&read_site_file();
+}

+1;
--- a/apache/backup_config.pl
+++ b/apache/backup_config.pl
@@ -14,23 +14,23 @@ push(@rv, map { $_->{'file'} } @$conf);
 # Add mime types file
 local $mfile = &find_directive("TypesConfig", $conf);
 if (!$mfile) { $mfile = $config{'mime_types'}; }
-if (!$mfile) { $mfile = &server_root("etc/mime.types", $conf); }
-if (!-r $mfile) { $mfile = &server_root("conf/mime.types", $conf); }
+if (!$mfile) { $mfile = &server_root("etc/mime.types"); }
+if (!-r $mfile) { $mfile = &server_root("conf/mime.types"); }
 if ($mfile) {
-	push(@rv, &server_root($mfile, $conf));
+	push(@rv, &server_root($mfile));
 	}

 # Add mime magic file
 local $magic = &find_directive("MimeMagicFile", $conf);
 if ($magic) {
-	push(@rv, &server_root($magic, $conf));
+	push(@rv, &server_root($magic));
 	}

 # Add all auth files
 local $auth;
 foreach $auth (&find_all_directives($conf, "AuthUserFile"),
 	       &find_all_directives($conf, "AuthGroupFile")) {
-	push(@rv, &server_root($auth, $conf));
+	push(@rv, &server_root($auth));
 	}

 return &unique(@rv);
--- a/apache/core.pl
+++ b/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' ],
@@ -108,7 +109,7 @@ return ();
 sub edit_MaxClients
 {
 return (1,
-	$text{'core_maxconc'},
+	&hlink($text{'core_maxconc'}, "MaxClients"),
 	&opt_input($_[0]->{'value'}, "MaxClients", $text{'core_default'}, 4));
 }
 sub save_MaxClients
@@ -117,6 +118,19 @@ return &parse_opt("MaxClients", '^\d+$',
 		  $text{'core_emaxconc'});
 }

+sub edit_MaxRequestWorkers
+{
+return (1,
+	&hlink($text{'core_maxconc'}, "MaxRequestWorkers"),
+	&opt_input($_[0]->{'value'}, "MaxRequestWorkers",
+		   $text{'core_default'}, 4));
+}
+sub save_MaxRequestWorkers
+{
+return &parse_opt("MaxRequestWorkers", '^\d+$',
+		  $text{'core_emaxconc'});
+}
+
 sub edit_MaxKeepAliveRequests
 {
 return (1,
@@ -132,7 +146,7 @@ return &parse_opt("MaxKeepAliveRequests", '^\d+$',
 sub edit_MaxRequestsPerChild
 {
 return (1,
-	$text{'core_maxreq'},
+	&hlink($text{'core_maxreq'}, "MaxRequestsPerChild"),
 	&opt_input($_[0]->{'value'}, "MaxRequestsPerChild", $text{'core_default'}, 5));
 }
 sub save_MaxRequestsPerChild
@@ -144,7 +158,7 @@ return &parse_opt("MaxRequestsPerChild", '^\d+$',
 sub edit_MinSpareServers
 {
 return (1,
-	$text{'core_minspare'},
+	&hlink($text{'core_minspare'}, "MinSpareServers"),
 	&opt_input($_[0]->{'value'},"MinSpareServers",$text{'core_default'}, 4));
 }
 sub save_MinSpareServers
@@ -156,7 +170,7 @@ return &parse_opt("MinSpareServers", '^\d+$',
 sub edit_MaxSpareServers
 {
 return (1,
-	$text{'core_maxspare'},
+	&hlink($text{'core_maxspare'}, "MaxSpareServers"),
 	&opt_input($_[0]->{'value'},"MaxSpareServers",$text{'core_default'}, 4));
 }
 sub save_MaxSpareServers
@@ -168,7 +182,7 @@ return &parse_opt("MaxSpareServers", '^\d+$',
 sub edit_StartServers
 {
 return (1,
-	$text{'core_initial'},
+	&hlink($text{'core_initial'}, "StartServers"),
 	&opt_input($_[0]->{'value'}, "StartServers", $text{'core_default'}, 4));
 }
 sub save_StartServers
@@ -177,9 +191,70 @@ return &parse_opt("StartServers", '^\d+$',
 		  $text{'core_einitial'});
 }

+sub edit_ServerLimit
+{
+return (1,
+	&hlink($text{'core_serverlimit'}, "ServerLimit"),
+	&opt_input($_[0]->{'value'}, "ServerLimit", $text{'core_default'}, 4));
+}
+sub save_ServerLimit
+{
+return &parse_opt("ServerLimit", '^\d+$',
+		  $text{'core_eserverlimit'});
+}
+
+sub edit_MinSpareThreads
+{
+return (1,
+	&hlink($text{'worker_minspare'}, "MinSpareThreads"),
+	&opt_input($_[0]->{'value'},"MinSpareThreads",$text{'core_default'}, 4));
+}
+sub save_MinSpareThreads
+{
+return &parse_opt("MinSpareThreads", '^\d+$',
+		  $text{'worker_eminspare'});
+}
+
+sub edit_MaxSpareThreads
+{
+return (1,
+	&hlink($text{'worker_maxspare'}, "MaxSpareThreads"),
+	&opt_input($_[0]->{'value'},"MaxSpareThreads",$text{'core_default'}, 4));
+}
+sub save_MaxSpareThreads
+{
+return &parse_opt("MaxSpareThreads", '^\d+$',
+		  $text{'worker_emaxspare'});
+}
+
+sub edit_ThreadLimit
+{
+return (1,
+	&hlink($text{'worker_threadlimit'}, "ThreadLimit"),
+	&opt_input($_[0]->{'value'},"ThreadLimit",$text{'core_default'}, 4));
+}
+sub save_ThreadLimit
+{
+return &parse_opt("ThreadLimit", '^\d+$',
+		  $text{'worker_ethreadlimit'});
+}
+
+sub edit_ThreadsPerChild
+{
+return (1,
+	&hlink($text{'worker_threads'}, "ThreadsPerChild"),
+	&opt_input($_[0]->{'value'},"ThreadsPerChild",$text{'core_default'}, 4));
+}
+sub save_ThreadsPerChild
+{
+return &parse_opt("ThreadsPerChild", '^\d+$',
+		  $text{'worker_ethreads'});
+}
+
 sub edit_RLimitCPU
 {
-return &rlimit_input("RLimitCPU", $text{'core_cpulimit'}, $_[0]);
+return &rlimit_input("RLimitCPU",
+		     &hlink($text{'core_cpulimit'}, "RLimitCPU"), $_[0]);
 }
 sub save_RLimitCPU
 {
@@ -188,7 +263,8 @@ return &parse_rlimit("RLimitCPU", $text{'core_cpulimit2'});

 sub edit_RLimitMEM
 {
-return &rlimit_input("RLimitMEM", $text{'core_memlimit'}, $_[0]);
+return &rlimit_input("RLimitMEM",
+		     &hlink($text{'core_memlimit'}, "RLimitMEM"), $_[0]);
 }
 sub save_RLimitMEM
 {
@@ -197,7 +273,8 @@ return &parse_rlimit("RLimitMEM", $text{'core_memlimit2'});

 sub edit_RLimitNPROC
 {
-return &rlimit_input("RLimitNPROC", $text{'core_proclimit'}, $_[0]);
+return &rlimit_input("RLimitNPROC",
+		     &hlink($text{'core_proclimit'}, "RLimitNPROC"), $_[0]);
 }
 sub save_RLimitNPROC
 {
@@ -958,6 +1035,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);
@@ -1051,7 +1356,7 @@ return &parse_opt("LockFile", '^\S+', $text{'core_elock'});

 sub edit_LimitRequestBody
 {
-return (1, $text{'core_maxbody'},
+return (1, &hlink($text{'core_maxbody'}, "LimitRequestBody"),
 	&opt_input($_[0]->{'value'}, "LimitRequestBody", $text{'core_default'}, 8)
 		.&ui_space(2).$text{'bytes'});
 }
@@ -1062,7 +1367,7 @@ return &parse_opt("LimitRequestBody", '^\d+$', $text{'core_ebody'});

 sub edit_LimitXMLRequestBody
 {
-return (1, $text{'core_maxxml'},
+return (1, &hlink($text{'core_maxxml'}, "LimitXMLRequestBody"),
 	&opt_input($_[0]->{'value'}, "LimitXMLRequestBody",
 		   $text{'core_default'}, 8).&ui_space(2).$text{'bytes'});
 }
@@ -1075,7 +1380,7 @@ return &parse_opt("LimitXMLRequestBody", '^\d+$', $text{'core_exml'});

 sub edit_LimitRequestFields
 {
-return (1, $text{'core_maxhead'},
+return (1, &hlink($text{'core_maxhead'}, "LimitRequestFields"),
 	&opt_input($_[0]->{'value'}, "LimitRequestFields", $text{'core_default'}, 6));
 }
 sub save_LimitRequestFields
@@ -1085,7 +1390,7 @@ return &parse_opt("LimitRequestFields", '^\d+$', $text{'core_ehead'});

 sub edit_LimitRequestFieldsize
 {
-return (1, $text{'core_maxshead'},
+return (1, &hlink($text{'core_maxshead'}, "LimitRequestFieldsize"),
 	&opt_input($_[0]->{'value'}, "LimitRequestFieldsize", $text{'core_default'}, 6));
 }
 sub save_LimitRequestFieldsize
@@ -1095,7 +1400,7 @@ return &parse_opt("LimitRequestFieldsize", '^\d+$', $text{'core_eshead'});

 sub edit_LimitRequestLine
 {
-return (1, $text{'core_maxline'},
+return (1, &hlink($text{'core_maxline'}, "LimitRequestLine"),
 	&opt_input($_[0]->{'value'}, "LimitRequestLine", $text{'core_default'}, 6));
 }
 sub save_LimitRequestLine
@@ -1402,4 +1707,3 @@ else { return ( [ ], [ ] ); }
 }

 1;
-
--- a/apache/create_virt.cgi
+++ b/apache/create_virt.cgi
@@ -119,8 +119,10 @@ elsif ($in{'fmode'} == 1) {
 else {
 	# Use a user-specified file
 	$f = $in{'file'};
+	&allowed_auth_file($f) ||
+		&error(&text('cvirt_efile', &html_escape($f), $!));
 	}
-r $f || open(FILE, ">>$f") || &error(&text('cvirt_efile', &html_escape($f), $!));
+-r $f || open(FILE, ">>", $f) || &error(&text('cvirt_efile', &html_escape($f), $!));
 close(FILE);

 &lock_apache_files();
--- a/apache/delete_vservs.cgi
+++ b/apache/delete_vservs.cgi
@@ -3,31 +3,107 @@

 require './apache-lib.pl';
 &ReadParse();
-&error_setup($text{'delete_err'});
+@d = split(/\0/, $in{'d'});
+$file_action = $in{'toggle'} ? "toggle" : undef;
+&error_setup($file_action ? $text{'enable_err'} : $text{'delete_err'});
 $access{'vaddr'} || &error($text{'delete_ecannot'});
 $conf = &get_config();
-@d = split(/\0/, $in{'d'});
+$can_vhost_files = &can_manage_vhost_files();
@d || &error($text{'delete_enone'});

+if ($file_action) {
+	&can_manage_vhost_files() || &error($text{'enable_elinkdir'});
+	foreach $d (@d) {
+		if ($d =~ /^file\t([^\t]+)/) {
+			$file = $1;
+			}
+		elsif ($d !~ /^file\t/) {
+			($vmembers, $vconf) = &get_virtual_config($d);
+			next if (!$vconf || !&can_edit_virt($vconf));
+			$file = $vconf->{'file'};
+			}
+		else {
+			next;
+			}
+		$rfile = $file ? &simplify_path(&resolve_links($file)) : undef;
+		$files{$rfile}++ if ($rfile && -f $rfile &&
+				      &can_manage_vhost_state_file($rfile));
+		}
+	@files = keys %files;
+	@files || &error($text{'enable_enone'});
+	foreach $file (@files) {
+		$action = &vhost_file_toggle_action($file);
+		$err = &virtualmin_vhost_file_state_error($file, $action);
+		$err && &error($err);
+		$file_actions{$file} = $action;
+		}
+	foreach $file (@files) {
+		$err = $file_actions{$file} eq "enable" ?
+			&enable_vhost_file($file) :
+			&disable_vhost_file($file);
+		$err && &error($err);
+		}
+	&webmin_log($file_action, "vhostfile", scalar(@files));
+	&redirect("");
+	exit;
+	}
+if (!$in{'delete'}) {
+	&error($text{'delete_eaction'});
+	}
+
 # Get them all
 foreach $d (@d) {
+	if ($d =~ /^file\t([^\t]+)\t(\d+)$/) {
+		push(@{$file_lines{$1}}, $2);
+		next;
+		}
+	elsif ($d =~ /^file\t/) {
+		next;
+		}
 	($vmembers, $vconf) = &get_virtual_config($d);
+	$vconf || &error($text{'delete_egone'});
 	&can_edit_virt($vconf) || &error(&text('delete_ecannot2',
 					       &virtual_name($vconf)));
+	$can_vhost_files && &is_default_vhost($vconf) &&
+		&error($text{'delete_edefault'});
 	push(@virts, $vconf);
 	}
+if (%file_lines) {
+	foreach $file (keys %file_lines) {
+		$rfile = &simplify_path(&resolve_links($file));
+		next if (!$rfile || !-f $rfile ||
+			 !&can_manage_vhost_state_file($rfile));
+		@fvirts = &find_virtuals_in_file($rfile);
+		foreach $line (@{$file_lines{$file}}) {
+			($vconf) = grep { $_->{'line'} == $line } @fvirts;
+			$vconf || &error($text{'delete_egone'});
+			&can_edit_virt($vconf) ||
+				&error(&text('delete_ecannot2',
+					     &virtual_name($vconf)));
+			&is_default_vhost($vconf) &&
+				&error($text{'delete_edefault'});
+			push(@{$file_virts{$rfile}}, $vconf);
+			}
+		}
+	}
+@virts || %file_virts || &error($text{'delete_enone'});

 # Delete their structures
-&before_changing();
+&before_changing(keys %file_virts);
 foreach $vconf (@virts) {
 	&lock_file($vconf->{'file'});
 	&save_directive_struct($vconf, undef, $conf, $conf);
 	&delete_file_if_empty($vconf->{'file'});
 	}
+foreach $file (keys %file_virts) {
+	&lock_file($file);
+	$deleted += &delete_virtuals_from_file($file, @{$file_virts{$file}});
+	&unlock_file($file);
+	}
 &flush_file_lines();
 &unlock_all_files();
 &update_last_config_change();
 &after_changing();
-&webmin_log("virts", "delete", scalar(@virts));
+$deleted += scalar(@virts);
+&webmin_log("virts", "delete", $deleted);
 &redirect("");
-
--- a/apache/edit_defines.cgi
+++ b/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");
--- a/Show More
+++ b/Show More